Matthieu Patou [Mon, 20 Oct 2014 06:04:46 +0000 (23:04 -0700)]
selftest: force the cast to Integer otherwise on Debian make test didn't pass
A summary with detailed information can be found in:
./st/summary
Traceback (most recent call last):
File "./buildtools/bin/waf", line 76, in <module>
Scripting.prepare(t, cwd, VERSION, wafdir)
File "/usr/local/src/samba/buildtools/wafadmin/Scripting.py", line 145, in prepare
prepare_impl(t, cwd, ver, wafdir)
File "/usr/local/src/samba/buildtools/wafadmin/Scripting.py", line 135, in prepare_impl
main()
File "/usr/local/src/samba/wscript", line 347, in main
wildcard_main(wildcard_cmd)
File "./buildtools/wafsamba/samba_wildcard.py", line 110, in wildcard_main
fun(ctx)
File "/usr/local/src/samba/selftest/wscript", line 240, in cmd_testonly
print "TOP %d slowest tests" % nb
TypeError: %d format: a number is required, not str
Change-Id: I073763b85741c12f679e2e68520deb3be57df637
Matthieu Patou [Sun, 12 Oct 2014 23:13:44 +0000 (16:13 -0700)]
Decrement the counter by one as actually we have index - 1 tests that have run
Change-Id: I1a8f4f61642f0dc57d99eb8ecd554093ed758e28
Signed-off-by: Matthieu Patou <mat@matws.net>
Michael Adam [Thu, 16 Oct 2014 22:41:24 +0000 (00:41 +0200)]
pam_winbind: fix comment typos
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Sat Oct 18 12:41:07 CEST 2014 on sn-devel-104
Matthieu Patou [Mon, 13 Oct 2014 03:59:02 +0000 (20:59 -0700)]
selftest: add documentation for options --exclude and --include that weren't documented before
Change-Id: Ibf0fa1c548d376dc8d68ab8136e2532f67dd1d8a
Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Fri Oct 17 20:20:12 CEST 2014 on sn-devel-104
Matthieu Patou [Mon, 13 Oct 2014 00:57:20 +0000 (17:57 -0700)]
selftest: report the 10 slowest tests (by default) make the number configurable
Change-Id: Ib1cf50199d110827a25cf198b40738f3c72cbe17
Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Matthieu Patou [Mon, 13 Oct 2014 00:56:10 +0000 (17:56 -0700)]
scripts: Allow to specify a limit on the number of tests reported
This allows to report the 10 most slowest for instance.
Change-Id: I987520dbc28f598221c47df314d823f916312aab
Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Andrew Bartlett [Mon, 13 Oct 2014 00:13:15 +0000 (13:13 +1300)]
ntlm_auth: Allow the --option parameter to work against ntlm_auth
Change-Id: Iee386624359c2bf8437719f286e306cdfbb628c6
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): Fri Oct 17 15:20:59 CEST 2014 on sn-devel-104
Andrew Bartlett [Sun, 12 Oct 2014 20:42:25 +0000 (09:42 +1300)]
ntlm_auth: Allow us to use kerberos when we are an AD DC
Change-Id: I88caff9ded915d914cb7fda8829ccbcd3ad64af1
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Wed, 1 Oct 2014 07:49:23 +0000 (20:49 +1300)]
docs: Explain that winbindd enforces smb signing by default.
Change-Id: I9341fa3bd7480836ac5e0c18e28458175b42d44a
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Stefan Metzmacher [Fri, 26 Sep 2014 01:39:13 +0000 (03:39 +0200)]
s3:libsmb: remove unused cli_set_username() function
Change-Id: Ib432b4ff66f966de9e733e01de6de2f486c0c728
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Stefan Metzmacher [Fri, 26 Sep 2014 01:35:30 +0000 (03:35 +0200)]
s3:libsmb: avoid calling cli_set_username() cliconnect.c
Change-Id: I45e44405ea51ecb1aa38c72f4fc6243a1d3d531a
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Stefan Metzmacher [Fri, 26 Sep 2014 01:33:45 +0000 (03:33 +0200)]
s3:libsmb: avoid calling cli_set_username() in clidfs
Change-Id: I8b32be8a10d2bff33bb468cc68c98e555b220bde
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Stefan Metzmacher [Fri, 26 Sep 2014 01:17:08 +0000 (03:17 +0200)]
s3:libsmb: avoid cli_set_username() in SMBC_server_internal()
Change-Id: I32e19078a4d4948e405f39dc2a479ff925ad3684
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Stefan Metzmacher [Fri, 26 Sep 2014 01:14:53 +0000 (03:14 +0200)]
s3:lib/netapi: avoid calling cli_set_username()
Change-Id: I3ab768d2df06749187555a16d7b930f7cc8f8b9f
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Stefan Metzmacher [Fri, 26 Sep 2014 01:13:28 +0000 (03:13 +0200)]
s3:torture: avoid unused cli_set_username()
Change-Id: Ia774b256093aff5f2b3338e7827e2d798fb06a96
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Stefan Metzmacher [Fri, 26 Sep 2014 01:10:19 +0000 (03:10 +0200)]
s3:libsmb: Remove unused domain copy stored in cli_state
Change-Id: I7333140906bb3a487205b5760396dcc00a9f49b0
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Tue, 23 Sep 2014 21:19:35 +0000 (14:19 -0700)]
s3:libsmb: Remove unused password copy stored in cli_state
Change-Id: Ia6b33a25628ae08be8a8c6baeb71ce390315cb45
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Tue, 23 Sep 2014 16:12:20 +0000 (09:12 -0700)]
s3-winbindd: use cli_rpc_pipe_open_with_creds()
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Tue, 23 Sep 2014 16:12:20 +0000 (09:12 -0700)]
s3-librpc: Add cli_rpc_pipe_open_with_creds()
This provides a credentials-based interface. In the long term, we
will want to change this not to reference the credentials, but for now
this suits the caller in winbindd_cm.c
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Wed, 11 Dec 2013 02:10:39 +0000 (15:10 +1300)]
s3-winbindd: Use own machine account to connect to trusted domains as well
This relies on a two-way trust, which we may not have, but is the only
secure way to do this. To do this correctly we need to split NETLOGON
from normal authentication, as we need to use the machine account for
the SMB level, but the inter-domain trust account for the NETLOGON
level.
Change-Id: Ib93eb6a4d704ef26df8234be7cb71c47ad519c8a
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Stefan Metzmacher [Thu, 8 Aug 2013 11:58:34 +0000 (13:58 +0200)]
s3-winbindd: use a cli_credentials structure to hold the trust credentials
Later we can pass this down directly and have a much more sane
handling of credentials and the spnego handshake.
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Change-Id: If12ef0b105d8c7af60190d4eed3c8c07849da2ca
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Andrew Bartlett [Fri, 3 Oct 2014 18:06:35 +0000 (07:06 +1300)]
libsmb: Print the principal name that we failed to kinit for.
This should aid debugging when this is called from an automated process.
Andrew Bartlett
Change-Id: I2c7291ab3f67f9f7462d7c52c8c9a4b042f7ec5a
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Thu, 2 Oct 2014 17:35:28 +0000 (06:35 +1300)]
passdb: Use common code in cli_credentials_set_machine_account_db_ctx()
This avoids some duplication in setting the machine account passsword
for the domain member and DC case.
This does not yet remove the duplication, that requires a bigger
restructure of the various routines used here to obtain the machine
and domain trust secrets.
Also no longer used is the timeout/2 code to not set the previous
password. It is now always passed to the caller.
Andrew Bartlett
Change-Id: Idd5bafedf4cbac30b174955d743ec4128a6902ee
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Mon, 6 Oct 2014 00:51:25 +0000 (13:51 +1300)]
auth/credentials: Ensure that we set the realm when reading secrets.tdb
Otherwise, we try and kinit as host$@DOMAIN and that will not work.
Andrew Bartlett
Change-Id: Id2fde673423e74dfa1e6ac48f47f49c61ee59779
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Thu, 2 Oct 2014 17:32:39 +0000 (06:32 +1300)]
credentials: Allow the secret.tdb handle to be passed in to cli_credentials_set_machine_account()
This adds a new wrapper, cli_credentials_set_machine_account_db_ctx()
Andrew Bartlett
Change-Id: Ia2cceefede4ba9cf7f8de41986daf9372c19d997
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Thu, 2 Oct 2014 16:14:56 +0000 (05:14 +1300)]
credentials: Improve error message on failure to set machine account password
Change-Id: I4136067d6d0e5cfe92770a2e7efa39f4ebcb2aca
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Thu, 2 Oct 2014 16:14:21 +0000 (05:14 +1300)]
credentials: Set secure_channel_type from secrets.tdb in cli_credentials_set_machine_account
This should ensure more parts of the source4 code can work with a
password set in secrets.tdb.
Andrew Bartlett
Change-Id: I4a890a719246b073898333d2e04841904c6e1a5d
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Tue, 7 Oct 2014 21:58:54 +0000 (10:58 +1300)]
selftest: Run samba.tests.messaging in an environment where it has servers to list
The previous code would run on empty databases.
Andrew Bartlett
Change-Id: I8f8e736b9ad475b5b3d10e32834450c76edc5ca2
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Andrew Bartlett [Tue, 7 Oct 2014 21:43:41 +0000 (10:43 +1300)]
tests: Allow "max open files" to differ from the documentation
It is system-dependent.
Andrew Bartlett
Change-Id: Icf21476c00295a428ad808bc56ab8153f109627f
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Amitay Isaacs [Tue, 14 Oct 2014 06:52:55 +0000 (17:52 +1100)]
ctdb-tools: Fix heap-use-after-free problem
Found by address sanitizer.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Fri Oct 17 12:56:02 CEST 2014 on sn-devel-104
Stefan Metzmacher [Tue, 7 Oct 2014 13:59:48 +0000 (15:59 +0200)]
libcli/smb: try to negotiate SMB2_ENCRYPTION_AES128_GCM
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): Thu Oct 16 21:53:32 CEST 2014 on sn-devel-104
Stefan Metzmacher [Mon, 13 Oct 2014 07:53:12 +0000 (09:53 +0200)]
libcli/smb: support SMB2_ENCRYPTION_AES128_GCM in smb2_signing_[de|en]crypt_pdu()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 7 Oct 2014 12:48:26 +0000 (14:48 +0200)]
lib/crypto: add aes_gcm_128 support.
Pair-Programmed-With: Michael Adam <obnox@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 7 Oct 2014 07:56:00 +0000 (09:56 +0200)]
libcli/smb: prepare smb2_signing_[de|en]crypt_pdu() to support multiple ciphers
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 7 Oct 2014 07:54:35 +0000 (09:54 +0200)]
s3:smb2_server: pass xconn->smb2.server.cipher to smb2_signing_[de|en]ncrypt_pdu()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Mon, 13 Oct 2014 09:07:01 +0000 (11:07 +0200)]
s3:smb2_server: check xconn->smb2.server.cipher instead of xconn->smb2.server.capabilities
SMB 3.10 and later won't have SMB2_CAP_ENCRYPTION anymore.
xconn->smb2.server.cipher == 0 is the indication that we don't support encryption on the connection.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Mon, 13 Oct 2014 09:07:01 +0000 (11:07 +0200)]
s3:smb2_negprot: remember xconn->smb2.server.cipher
For now we always use SMB2_ENCRYPTION_AES128_CCM or 0.
0 is the indication that we don't support encryption on the connection.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 7 Oct 2014 07:54:35 +0000 (09:54 +0200)]
libcli/smb: pass the negotiated cipher to smb2_signing_[de|en]ncrypt_pdu()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 7 Oct 2014 07:51:58 +0000 (09:51 +0200)]
libcli/smb: pass 'uint16_t cipher_id' to smb2_signing_[de|en]crypt_pdu()
enum protocol_types protocol was unused before
and cipher_id is unused as well for now.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Mon, 13 Oct 2014 08:39:45 +0000 (10:39 +0200)]
libcli/smb: use conn->smb2.server.cipher != 0 instead of conn->smb2.server.capabilities & SMB2_CAP_ENCRYPTION
SMB 3.10 servers don't report SMB2_CAP_ENCRYPTION anymore.
So using conn->smb2.server.cipher != 0 is a more consistent way to decide if
encryption is supported on the connection.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
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>