Martin Schwenke [Thu, 16 Oct 2014 08:50:56 +0000 (19:50 +1100)]
lib/util: Protect time_basic.h against multiple inclusion
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Thu Oct 16 16:35:59 CEST 2014 on sn-devel-104
Jelmer Vernooij [Sat, 27 Sep 2014 13:05:54 +0000 (15:05 +0200)]
update-external.sh: Update upstream URLs for testtools and subunit.
Change-Id: Iaba422aa5dec30c3a4953907d9d73e018206e0e6
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Oct 16 01:35:19 CEST 2014 on sn-devel-104
Jelmer Vernooij [Sat, 27 Sep 2014 13:01:16 +0000 (15:01 +0200)]
Fix path to zlib in update-external.sh.
Change-Id: I25f308d037cc47bacd3a371cafca9c3e22f4a92d
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Jelmer Vernooij [Wed, 16 Jul 2014 23:20:35 +0000 (01:20 +0200)]
Update zlib using update-external.sh.
Change-Id: I9465ef84084a70187f693fea4762f3d68274fe99
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Andreas Schneider [Wed, 15 Oct 2014 09:29:12 +0000 (11:29 +0200)]
nss_wrapper: check for nss.h
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Wed Oct 15 14:06:11 CEST 2014 on sn-devel-104
Günther Deschner [Mon, 13 Oct 2014 18:01:05 +0000 (20:01 +0200)]
libcli/smb: use lib/crypto SHA512 functions, do not depend on heimdal.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Tue Oct 14 13:13:08 CEST 2014 on sn-devel-104
Günther Deschner [Mon, 13 Oct 2014 18:00:11 +0000 (20:00 +0200)]
lib/crypto: add and build a copied version of SHA512 functions.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Jelmer Vernooij [Mon, 13 Oct 2014 04:18:08 +0000 (21:18 -0700)]
filter-subunit: Drop support for allow_empty_output hack.
Change-Id: If4f336ef770202dcf69484b9bccc6c0c80bd5f9b
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Oct 14 09:06:05 CEST 2014 on sn-devel-104
Jelmer Vernooij [Mon, 13 Oct 2014 04:17:05 +0000 (21:17 -0700)]
samba3dump: Add subunit-enabled test for samba3dump.
Change-Id: Ie9682c715fc91d923dcd1951236f8b36fa519327
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Jelmer Vernooij [Mon, 13 Oct 2014 04:11:22 +0000 (21:11 -0700)]
urgent_replication: Use subunit reporting, remove allow_empty_output.
Change-Id: I6d479b218eff6c4292fbb99e4760bbd62ce1f380
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Jelmer Vernooij [Mon, 13 Oct 2014 02:53:35 +0000 (19:53 -0700)]
testr: Use waf testonly and create a custom directory for new workers.
Using waf testonly helps speed up test runs, and the custom directory is
required to run multiple workers in parallel.
Change-Id: I339420c5c503c270a04888a1c990836cb0c91e94
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Jelmer Vernooij [Mon, 13 Oct 2014 02:52:49 +0000 (19:52 -0700)]
selftest: Actually honor --with-selftest-prefix.
Change-Id: Ie8c995a273781309224e17b8970a864479444036
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Jelmer Vernooij [Mon, 13 Oct 2014 00:58:41 +0000 (17:58 -0700)]
Don't import into testr when --load-list was specified, as testr will
take care of that itself.
Change-Id: I3d57f4cfafdd48751dfbd145f220dc5cf000ec3f
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Jelmer Vernooij [Mon, 13 Oct 2014 00:49:39 +0000 (17:49 -0700)]
Don't ignore testsuites without --list support, but consider them as
atomic entities.
This prevents any such testsuites from being skipped when run using
testr.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10874
Change-Id: I6ae8c92bb70e86a3b848b9cb3a53e2af466c3fe3
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Jelmer Vernooij [Mon, 13 Oct 2014 00:48:10 +0000 (17:48 -0700)]
Run duplicate symbol check as just another test, rather than as part of "waf test".
This allows it to be scheduled independently as part of a parallel test
run, and reduces the overhead of "waf test".
Change-Id: I780fd2c4dd711ed27df73f56de98e7f1ffd53aaf
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10875
Jelmer Vernooij [Sun, 12 Oct 2014 23:08:15 +0000 (16:08 -0700)]
samba.tests.unicodenames: Fix docstring formatting so pydoctor understands it.
Change-Id: I8983cd4483c380fd0c9e4da843eb70750450a0fa
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Jelmer Vernooij [Sun, 12 Oct 2014 23:07:41 +0000 (16:07 -0700)]
py_net: Fix typo in change_password docstring, and indentation in
set_password docstring.
Change-Id: I93e9ed79ee43233fc3c1bb69d8eb0a5c6e0e3940
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Jelmer Vernooij [Sun, 12 Oct 2014 23:07:34 +0000 (16:07 -0700)]
samba_tool_drs: Fix docstring formatting so pydoctor groks it.
Change-Id: I827044ef876118935b0f91e318d3c815326a2f01
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Jelmer Vernooij [Sun, 12 Oct 2014 22:48:53 +0000 (15:48 -0700)]
Fix pydoctor invocation.
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10754
Change-Id: I1ca311dcba52350dc284439119a8166dee1de50a
Jelmer Vernooij [Sat, 27 Sep 2014 16:03:04 +0000 (18:03 +0200)]
samba.tests.source: Fix lint.
Change-Id: I3dc614c34aa2c4fca6f2ca68196e71b9129b5b76
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Jelmer Vernooij [Mon, 2 Jun 2014 01:12:52 +0000 (03:12 +0200)]
Remove obsolete pep8 test.
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: I7f6634a035e9c93820cd4eef0261ecd5dd3865ab
Jelmer Vernooij [Mon, 2 Jun 2014 00:53:01 +0000 (02:53 +0200)]
Fix more pep8 issues in code I touched recently.
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: I35f3204bdf5d00b3280d703427ded2fa2163a6f7
Jelmer Vernooij [Mon, 2 Jun 2014 00:37:11 +0000 (02:37 +0200)]
Remove last instances of pep8 error E602 (old style exceptions).
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: If709757643e6eed8cffa8950170c337f51edb9d9
Jelmer Vernooij [Mon, 2 Jun 2014 00:36:13 +0000 (02:36 +0200)]
Remove last instances of pep8 error E712 (use 'is' rather than '==' for booleans)
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: I43b394a6225b4c2049d979fda75548c82d781f67
Jelmer Vernooij [Mon, 2 Jun 2014 00:24:06 +0000 (02:24 +0200)]
pep8: Import new version.
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: I22d897a8f46a4ac57a91db3ad05286d9d0066806
Jelmer Vernooij [Sun, 1 Jun 2014 23:34:47 +0000 (01:34 +0200)]
Remove last instance of pep8 error E701 (more statements on one line).
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: I419f0536b43d98ce6bb52c5907413a02ea1a6937
Jelmer Vernooij [Sun, 1 Jun 2014 23:33:43 +0000 (01:33 +0200)]
Remove remaining instance of pep8 E211 (too many spaces before operator).
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: I9af3bf582bba8fc1094addb12cd0a5ce04406b5b
Martin Schwenke [Fri, 10 Oct 2014 07:46:31 +0000 (18:46 +1100)]
lib/util: Add RFC3339 timestamp support to timeval_str_buf()
Note that this can't be done more simply or portably with strftime(3)
since "%z" isn't portable.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Pair-programmed-with: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Mon Oct 13 12:27:04 CEST 2014 on sn-devel-104
Martin Schwenke [Wed, 8 Oct 2014 04:52:37 +0000 (15:52 +1100)]
lib/util: Use snprintf() instead of strftime() in timeval_str_buf()
This removes conditional code and ensures that the output is always as
expected.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Pair-programmed-with: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Andrew Bartlett [Mon, 1 Sep 2014 21:48:34 +0000 (09:48 +1200)]
dsdb: Do not attempt to return beyond the end of the password history array
Found by AddressSanitizer
Change-Id: I82e35aea60726053c79510ba8ed3eedfaf553eb7
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Matthieu Patou <mat@matws.net>
Autobuild-User(master): Matthieu Patou <mat@samba.org>
Autobuild-Date(master): Mon Oct 13 08:28:15 CEST 2014 on sn-devel-104
Ralph Boehme [Fri, 10 Oct 2014 11:53:56 +0000 (13:53 +0200)]
vfs_posixacl: catch ACL_EVERYONE on FreeBSD
Using POSIX ACL API on FreeBSD may return NFSv4 style tag type
ACL_EVERYONE. Catch the error and issue a helpful log message telling
users to enable zfsacl VFS module.
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sun Oct 12 00:22:19 CEST 2014 on sn-devel-104
Volker Lendecke [Fri, 10 Oct 2014 13:37:55 +0000 (15:37 +0200)]
dsdb: Fix a crash in an error return
In an error return we have
/* Back it out, if it fails on one */
for (i--; i >= 0; i--) {
ldb_next_del_trans(data->partitions[i]->module);
}
With unsigned int i this will spin and del_trans somewhere far off :-)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Volker Lendecke [Fri, 10 Oct 2014 09:40:14 +0000 (11:40 +0200)]
smbd: Fix a use-after-free
We can't reference xconn->next after it was talloc_free'ed
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Fri Oct 10 14:32:53 CEST 2014 on sn-devel-104
Jeremy Allison [Wed, 8 Oct 2014 16:06:06 +0000 (09:06 -0700)]
s3: smbd: Preparation for leases code merge. Ensure VFS is ready for 4.2.0.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Oct 10 02:55:53 CEST 2014 on sn-devel-104
Matthieu Patou [Thu, 3 Oct 2013 16:45:19 +0000 (09:45 -0700)]
pidl-wireshark: insure that we have an entire match for the variable name
Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Fri Oct 10 00:32:40 CEST 2014 on sn-devel-104
Matthieu Patou [Sun, 29 Sep 2013 07:42:36 +0000 (00:42 -0700)]
pidl-wireshark: generate an error for the new Pipe type in typedef
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Matthieu Patou <mat@matws.net>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Matthieu Patou [Tue, 1 Oct 2013 19:04:02 +0000 (12:04 -0700)]
pidl-wireshark: add the type dom_sid28 and call ad-hoc dissector
Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Matthieu Patou [Thu, 3 Oct 2013 08:10:48 +0000 (01:10 -0700)]
pidl-wireshark: add a function to change the type of a hf_field
We can use this to change the type FT_BYTE when we realize that the
object dissected is an array of bytes
Change-Id: I2d09c557fd050d0c279b8fff0a27db53403366ca
Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Matthieu Patou [Thu, 3 Oct 2013 08:07:55 +0000 (01:07 -0700)]
pidl-wireshark: cosmetic reformat
Change-Id: I86a0d4f13575e5ef7c6968b93ce126e5df981873
Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Matthieu Patou [Tue, 23 Sep 2014 08:28:40 +0000 (01:28 -0700)]
pidl-wireshark: Handle the case when the DATA_TYPE is not a simple type
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Change-Id: If78f241333c1372c60c7d00211c1e6aeb22c9719
Signed-off-by: Matthieu Patou <mat@matws.net>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Matthieu Patou [Sun, 5 Oct 2014 04:19:12 +0000 (21:19 -0700)]
pidl: Improve string delection in function ContainsString
Change-Id: I037e8b5f54fca8b512fd14edbefa34e59cb7f953
Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Matthieu Patou [Tue, 23 Sep 2014 04:52:14 +0000 (21:52 -0700)]
pidl: Make the compilation of PIDL producing the same results if the content hasn't change
Newer perl versions don't generate stable results anymore.
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Change-Id: I2fb1e12da392ca85bfd0fb8b50b69851076144ee
Signed-off-by: Matthieu Patou <mat@matws.net>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Ralph Boehme [Thu, 9 Oct 2014 14:41:10 +0000 (16:41 +0200)]
ncacn_http: fix GNUism
%a format conversion is a GNU extension, use the more portable %m.
It's at least in SUSv4, supported by glibc since 2.7 and FreeBSD 10.
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Oct 9 22:05:26 CEST 2014 on sn-devel-104
Ralph Boehme [Thu, 9 Oct 2014 12:34:02 +0000 (14:34 +0200)]
lib/texpect: portability fix, include signal.h
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Andreas Schneider [Thu, 9 Oct 2014 13:55:36 +0000 (15:55 +0200)]
configure: Unload the wrappers so waf configure succeeds.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Oct 9 19:32:16 CEST 2014 on sn-devel-104
Björn Baumbach [Thu, 9 Oct 2014 08:54:51 +0000 (10:54 +0200)]
build: do not install texpect binary anymore.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10862
Signed-off-by: Bjoern Baumbach <bb@sernet.de>
Reviewed-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Thu Oct 9 17:10:12 CEST 2014 on sn-devel-104
Andreas Schneider [Thu, 9 Oct 2014 07:17:37 +0000 (09:17 +0200)]
nwrap: Bump version of nss_wrapper to 1.0.3.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Oct 9 14:47:16 CEST 2014 on sn-devel-104
Andreas Schneider [Thu, 9 Oct 2014 07:17:07 +0000 (09:17 +0200)]
nwrap: Make sure addr is initialized.
CID #72755
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andreas Schneider [Thu, 9 Oct 2014 07:16:33 +0000 (09:16 +0200)]
nwrap: Use DNS_NAME_MAX cause it is not available on BSD.
Also HOST_NAME_MAX is only for the value returned by gethostname(). It
is normally limited to 64 chars on Linux.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andreas Schneider [Thu, 9 Oct 2014 07:15:59 +0000 (09:15 +0200)]
nwrap: Don't overflow the in_addr if convert IPv6.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andreas Schneider [Thu, 9 Oct 2014 07:14:57 +0000 (09:14 +0200)]
nwrap: Fix resolving hostnames with a trailing dot.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andreas Schneider [Thu, 9 Oct 2014 07:13:48 +0000 (09:13 +0200)]
nwrap: Fall back to RTLD_NEXT if we can't find libc.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Günther Deschner [Mon, 29 Sep 2014 14:01:25 +0000 (16:01 +0200)]
s3-net: display full value of "msDS-SupportedEncryptionTypes".
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Wed Oct 8 18:18:50 CEST 2014 on sn-devel-104
Volker Lendecke [Wed, 8 Oct 2014 13:39:28 +0000 (15:39 +0200)]
registry: Don't leave dangling transactions
When a createkey fails due to access denied, we need to do a
transaction_cancel. Otherwise the lock on the db will stay around.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Andrew Bartlett [Fri, 5 Sep 2014 04:59:00 +0000 (16:59 +1200)]
s3-winbindd: Attempt to connect to NETLOGON over NCACN_IP_TCP if we can
This is very helpful in the trusted domain situation, as we may not
have a two-way trust but we can use our domain trust account to set up
a connection to NETLOGON
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Oct 8 12:48:15 CEST 2014 on sn-devel-104
Martin Schwenke [Mon, 25 Aug 2014 04:05:48 +0000 (14:05 +1000)]
build: Hook CTDB into top level build using --with-cluster-support
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Oct 8 09:42:08 CEST 2014 on sn-devel-104
Martin Schwenke [Mon, 25 Aug 2014 03:46:00 +0000 (13:46 +1000)]
ctdb-build: Make some steps conditional on standalone build
CTDB's current wscript assumes that it is only used as part of a
standalone build. However, it will soon be part of a unified build so
make some steps conditional.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Martin Schwenke [Fri, 26 Sep 2014 05:42:34 +0000 (15:42 +1000)]
ctdb-build: Rename define BINDIR to CTDB_HELPER_BINDIR
This avoids a clash with Samba's BINDIR and also makes it easier to
move the helpers to somewhere else (e.g. libexec) in the future.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Andrew Bartlett [Tue, 23 Sep 2014 03:47:57 +0000 (20:47 -0700)]
s3-rpc_client: Migrate to cli_rpc_pipe_open_generic_auth and remove cli_rpc_pipe_open_spnego
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Oct 8 03:36:52 CEST 2014 on sn-devel-104
Andrew Bartlett [Tue, 23 Sep 2014 03:33:43 +0000 (20:33 -0700)]
s3-rpc_client: Adapt cli_rpc_pipe_open_generic_auth to use enum credentials_kerberos_state
This allows us to pass this value in directly from the cli_credentials structure in winbindd, once we merge this with cli_rpc_pipe_open_spnego().
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Tue, 23 Sep 2014 03:28:01 +0000 (20:28 -0700)]
s3-rpc_client: Adapt cli_rpc_pipe_open_spnego to use enum credentials_kerberos_state
This allows us to pass this value in directly from the cli_credentials
structure in winbindd.
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Tue, 23 Sep 2014 21:08:10 +0000 (14:08 -0700)]
s3-winbindd: Allow winbindd to connect over SMB2 to servers
This allows SMB signing to work against many more DCs, and so improves network security.
The default for "client max protocol" remains NT1 in the rest of the code.
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Tue, 23 Sep 2014 17:35:21 +0000 (10:35 -0700)]
s3-winbindd: Pass the whole winbindd_domain to invalidate_cm_connection()
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Matthieu Patou [Mon, 6 Oct 2014 23:44:16 +0000 (16:44 -0700)]
tests: Pass the test context as lp_ctx for messaging tests
Change-Id: I1acf5c42b21465a8c45549039f0054414b8f31d1
Signed-off-by: Matthieu Patou <mat@matws.net>
Stefan Metzmacher [Mon, 6 Oct 2014 11:34:49 +0000 (13:34 +0200)]
libcli/smb: remove unused SMB2_TF_ALGORITHM define
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Oct 8 01:08:40 CEST 2014 on sn-devel-104
Stefan Metzmacher [Mon, 6 Oct 2014 11:33:24 +0000 (13:33 +0200)]
libcli/smb: use SMB 3.10 flags for the transform header
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Mon, 29 Sep 2014 08:30:21 +0000 (10:30 +0200)]
libcli/smb: pass tcon flags to the server for SMB 3.10
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Stefan Metzmacher [Fri, 26 Sep 2014 19:28:14 +0000 (21:28 +0200)]
libcli/smb: avoid validate info after tcon for SMB 3.10
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Stefan Metzmacher [Wed, 24 Sep 2014 20:58:49 +0000 (22:58 +0200)]
libcli/smb: implement SMB 3.10 session setup
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 23 Sep 2014 02:09:16 +0000 (04:09 +0200)]
libcli/smb: implement SMB 3.10 negprot
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Wed, 24 Sep 2014 06:59:58 +0000 (08:59 +0200)]
libcli/smb: add smb2cli_req_get_send_iov()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 23 Sep 2014 02:09:16 +0000 (04:09 +0200)]
libcli/smb: add smb2_negotiate_context.c
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Mon, 29 Sep 2014 08:14:08 +0000 (10:14 +0200)]
libcli/smb: add SMB 3.10 related defines
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 23 Sep 2014 02:07:00 +0000 (04:07 +0200)]
docs-xml: document SMB3_10 as available protocol for the client side
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 23 Sep 2014 02:03:49 +0000 (04:03 +0200)]
s3:torture: add PROTOCOL_SMB3_10 handling
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 23 Sep 2014 02:02:40 +0000 (04:02 +0200)]
lib/param: add PROTOCOL_SMB3_10 handling
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 23 Sep 2014 02:01:01 +0000 (04:01 +0200)]
libcli/smb: negotiate SMB3_DIALECT_REVISION_310 if PROTOCOL_SMB3_10 is requested
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 23 Sep 2014 01:58:48 +0000 (03:58 +0200)]
libcli/smb: add PROTOCOL_SMB3_10
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 23 Sep 2014 01:57:04 +0000 (03:57 +0200)]
libcli/smb: add SMB3_DIALECT_REVISION_310 define
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Mon, 6 Oct 2014 12:19:39 +0000 (14:19 +0200)]
libcli/smb: fix smb2cli_validate_negotiate_info with min=PROTOCOL_NT1 max=PROTOCOL_SMB2_02
If the connection starts with a SMB Negprot, the server only implies the
selected dialect, but not the clients security mode.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
David Disseldorp [Tue, 7 Oct 2014 12:49:59 +0000 (14:49 +0200)]
printer_list: fix talloc tos leak of tdb record
Reported-by: Franz Pförtsch <franz.pfoertsch@brose.com>
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Tue Oct 7 19:25:09 CEST 2014 on sn-devel-104
Volker Lendecke [Mon, 6 Oct 2014 15:17:54 +0000 (15:17 +0000)]
idl: Fix a typo
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Tue Oct 7 17:03:42 CEST 2014 on sn-devel-104
Volker Lendecke [Mon, 6 Oct 2014 14:12:52 +0000 (14:12 +0000)]
smbd: Simplify remove_child_pid
In this if-branch ret is always != 0.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Volker Lendecke [Tue, 30 Sep 2014 12:51:37 +0000 (12:51 +0000)]
status: 80 chars per line
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Volker Lendecke [Thu, 11 Sep 2014 14:46:39 +0000 (16:46 +0200)]
smbd: Fix nonempty line endings
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
David Disseldorp [Mon, 6 Oct 2014 16:21:18 +0000 (18:21 +0200)]
lanman: don't leak cache_path onto talloc tos
Also check for allocation failures.
Reported-by: Franz Pförtsch <franz.pfoertsch@brose.com>
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Mon Oct 6 21:41:22 CEST 2014 on sn-devel-104
David Disseldorp [Mon, 6 Oct 2014 16:21:17 +0000 (18:21 +0200)]
samlogon_cache: don't leak cache_path onto talloc tos
Also check for allocation failures.
Reported-by: Franz Pförtsch <franz.pfoertsch@brose.com>
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
David Disseldorp [Mon, 6 Oct 2014 16:21:16 +0000 (18:21 +0200)]
nmbd: don't leak cache_path onto talloc tos
Reported-by: Franz Pförtsch <franz.pfoertsch@brose.com>
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
David Disseldorp [Mon, 6 Oct 2014 16:21:15 +0000 (18:21 +0200)]
printing: don't leak cache_path onto talloc tos
Also check for allocation failures.
Reported-by: Franz Pförtsch <franz.pfoertsch@brose.com>
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
David Disseldorp [Mon, 6 Oct 2014 16:21:14 +0000 (18:21 +0200)]
gpo: don't leak cache_path onto talloc tos
Also check for allocation failures.
Reported-by: Franz Pförtsch <franz.pfoertsch@brose.com>
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
David Disseldorp [Mon, 6 Oct 2014 16:21:13 +0000 (18:21 +0200)]
gencache: don't leak cache_path onto talloc tos
Also check for allocation failures.
Reported-by: Franz Pförtsch <franz.pfoertsch@brose.com>
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Richard Sharpe [Sat, 4 Oct 2014 19:06:10 +0000 (12:06 -0700)]
Add a status code for VHD support gleaned from some Win8.1 stuff.
Signed-off-by: Richard Sharpe (rsharpe@samba.org)
Reviewed-by: Jeremy Allison <jra@samba.org>
Richard Sharpe [Sun, 5 Oct 2014 02:05:03 +0000 (19:05 -0700)]
Add a definition of the NETWORK_RESILIENCY_REQUEST so I can write a torture test for it.
Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Andrew Bartlett [Sun, 5 Oct 2014 05:32:09 +0000 (18:32 +1300)]
winbindd: Do not overwrite domain list with conflicting info from a trusted domain
This places less trust in our primary DC or trusted domain DC and refuses to update info that is conflicting
This does not currently reject the connection to the DC, but only ensures it can only update missing information or to correct the case of the domain.
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Mon Oct 6 17:21:03 CEST 2014 on sn-devel-104
Andrew Bartlett [Sun, 5 Oct 2014 03:00:47 +0000 (16:00 +1300)]
torture: Reorder torture_winbind_struct_domain_info tests
This tries to ensure we get enough information to debug this
intermittent failure.
I think this may be a real failure, but it is hard to tell without more info.
This patch prints out the full details of what the domain returned before
doing the assertions.
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Martin Schwenke [Fri, 29 Aug 2014 11:17:30 +0000 (21:17 +1000)]
ctdb-build: Fix handling of public headers
Add the header munging, add/package ctdb_version.h, create
directory include/public.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Mon Oct 6 14:56:07 CEST 2014 on sn-devel-104
Martin Schwenke [Fri, 15 Aug 2014 06:41:57 +0000 (16:41 +1000)]
ctdb-build: Change from ctdb-util to samba-util
Remove local lib/util and lib/tdb-wrap. Update wscript, packaging and
includes.h.
The only potentially surprising thing here is a fake samba-util
subsystem that just depends on samba-util-core. As explained in a
comment:
When a combined build is implemented, CTDB will wanted to build
against samba-util rather than samba-util-core. Similarly, other
Samba subsystems expect samba-util. So, for a standalone build,
just define a fake samba-util subsystem that pulls in
samba-util-core.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
Martin Schwenke [Mon, 25 Aug 2014 03:28:30 +0000 (13:28 +1000)]
ctdb-build: Add generation of Samba-style version.h
This is needed by fault.c.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
Martin Schwenke [Mon, 25 Aug 2014 03:21:12 +0000 (13:21 +1000)]
ctdb-build: Move generation of ctdb_version.h earlier
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
Martin Schwenke [Tue, 19 Aug 2014 02:15:31 +0000 (12:15 +1000)]
ctdb-logging: Update to use Samba style debug.h/debug.c
Samba's debug subsystem has changed a lot, so CTDB's logging needs
to be rewritten to be compatible.
The new debug.h/debug.c can't just be pulled in because it has some
extra dependencies into Samba's lib/util. For now, to support the
smallest possible patch, implement a minimal subset of Samba's
debug.[ch] that just supports the DEBUG_CALLBACK logtype.
Define a callback for each logging method.
Check later to see if debug_extra (or similar) can somehow be
implemented using debug classes.
The timestamp on CTDB CLI tool and test program DEBUG() output goes
away, so update the unit test code to cope.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>