autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-06-0643/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-06-0643/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-06-0643/samba.stdout The top commit at the time of the failure was: commit 7c84cb54fc34bdd1c4d79cd6b588256c9bacc705 Author: Stefan MetzmacherDate: Fri Sep 2 17:23:28 2016 +0200 wafsamba: add -Werror=format-security to the developer build Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Mon Sep 5 20:23:00 CEST 2016 on sn-devel-144
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via b6efe01 Add "Release Planning" to the releases box from 86b72c9 NEWS[4.5.0rc3]: Samba 4.5.0rc3 Available for Download https://git.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit b6efe01718ee7783fc62206f3da4292371f3d4aa Author: Martin SchwenkeDate: Tue Sep 6 13:27:01 2016 +1000 Add "Release Planning" to the releases box Signed-off-by: Martin Schwenke --- Summary of changes: box_releases.html | 1 + 1 file changed, 1 insertion(+) Changeset truncated at 500 lines: diff --git a/box_releases.html b/box_releases.html index 98bbea9..271c80b 100644 --- a/box_releases.html +++ b/box_releases.html @@ -16,6 +16,7 @@ Future + https://wiki.samba.org/index.php/Samba_Release_Planning;>Release Planning https://wiki.samba.org/index.php/Roadmap;>Roadmap -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via aef1d45 samba-tool: Remove --use-xattrs support without --use-ntvfs from 7c84cb5 wafsamba: add -Werror=format-security to the developer build https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit aef1d45c9a3af5ac9a5f262604d1f364c397875c Author: Andrew BartlettDate: Sun Sep 4 21:33:30 2016 +1200 samba-tool: Remove --use-xattrs support without --use-ntvfs The only reasonable use --use-xattrs=no should be used is in selftest, and there is no need for that or --use-xattrs=auto without --use-ntvfs, all systems we support in production for the AD DC have xattrs, as using smbd needs posix ACLs. This also removes the option entirely if NTVFS support is omitted from the build. I would prefer to get rid of the option, but currently selftest relies on the default of --use-xattrs=auto, and we first should get rid of that auto-detection, which will then mean we need --use-xattrs=no specified wherever we specify --use-ntvfs. Signed-off-by: Andrew Bartlett Reviewed-by: Garming Sam Autobuild-User(master): Garming Sam Autobuild-Date(master): Tue Sep 6 04:21:42 CEST 2016 on sn-devel-144 --- Summary of changes: python/samba/netcmd/domain.py | 30 -- 1 file changed, 24 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 928caa3..9661828 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -236,8 +236,6 @@ class cmd_domain_provision(Command): help="Set target directory"), Option("--ol-mmr-urls", type="string", metavar="LDAPSERVER", help="List of LDAP-URLS [ ldap://:/ (where has to be different than 389!) ] separated with comma (\",\") for use with OpenLDAP-MMR (Multi-Master-Replication), e.g.: \"ldap://s4dc1:9000,ldap://s4dc2:9000\";), - Option("--use-xattrs", type="choice", choices=["yes", "no", "auto"], help="Define if we should use the native fs capabilities or a tdb file for storing attributes likes ntacl, auto tries to make an inteligent guess based on the user rights and system capabilities", default="auto"), - Option("--use-rfc2307", action="store_true", help="Use AD to store posix attributes (default = no)"), ] @@ -253,7 +251,13 @@ class cmd_domain_provision(Command): ] ntvfs_options = [ - Option("--use-ntvfs", action="store_true", help="Use NTVFS for the fileserver (default = no)"), +Option("--use-ntvfs", action="store_true", help="Use NTVFS for the fileserver (default = no)"), +Option("--use-xattrs", type="choice", choices=["yes","no","auto"], + metavar="[yes|no|auto]", + help="Define if we should use the native fs capabilities or a tdb file for " + "storing attributes likes ntacl when --use-ntvfs is set. " + "auto tries to make an inteligent guess based on the user rights and system capabilities", + default="auto") ] if os.getenv('TEST_LDAP', "no") == "yes": @@ -409,6 +413,11 @@ class cmd_domain_provision(Command): if use_xattrs == "yes": eadb = False +elif use_xattrs == "auto" and use_ntvfs == False or use_ntvfs == None: +eadb = False +elif use_ntvfs == False or use_ntvfs == None: +raise CommandError("--use-xattrs=no requires --use-ntvfs (not supported for production use). " + "Please re-run with --use-xattrs omitted.") elif use_xattrs == "auto" and not lp.get("posix:eadb"): if targetdir: file = tempfile.NamedTemporaryFile(dir=os.path.abspath(targetdir)) @@ -1457,8 +1466,6 @@ class cmd_domain_classicupgrade(Command): help="Path prefix where the new Samba 4.0 AD domain should be initialised"), Option("--quiet", help="Be quiet", action="store_true"), Option("--verbose", help="Be verbose", action="store_true"), -Option("--use-xattrs", type="choice", choices=["yes","no","auto"], metavar="[yes|no|auto]", - help="Define if we should use the native fs capabilities or a tdb file for storing attributes likes ntacl, auto tries to make an inteligent guess based on the user rights and system capabilities", default="auto"), Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND", choices=["SAMBA_INTERNAL", "BIND9_FLATFILE", "BIND9_DLZ", "NONE"], help="The DNS server backend. SAMBA_INTERNAL is the builtin name server (default), " @@ -1470,7
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-06-0330/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-06-0330/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-06-0330/samba.stdout The top commit at the time of the failure was: commit 7c84cb54fc34bdd1c4d79cd6b588256c9bacc705 Author: Stefan MetzmacherDate: Fri Sep 2 17:23:28 2016 +0200 wafsamba: add -Werror=format-security to the developer build Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Mon Sep 5 20:23:00 CEST 2016 on sn-devel-144
autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2016-09-06-0320/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2016-09-06-0320/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2016-09-06-0320/samba.stdout The top commit at the time of the failure was: commit 7c84cb54fc34bdd1c4d79cd6b588256c9bacc705 Author: Stefan MetzmacherDate: Fri Sep 2 17:23:28 2016 +0200 wafsamba: add -Werror=format-security to the developer build Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Mon Sep 5 20:23:00 CEST 2016 on sn-devel-144
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-05-2330/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-05-2330/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-05-2330/samba.stdout The top commit at the time of the failure was: commit ec455796fe91fa97acd339be24baa75358395621 Author: Uri SimchoniDate: Mon Sep 5 08:52:52 2016 +0300 selftest: detect older tshark version Detect older versions of tshark, which do not recognize the -Y option, and skip the kerberos enc type tests Signed-off-by: Uri Simchoni Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Mon Sep 5 16:31:58 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch v4-3-test updated
The branch, v4-3-test has been updated via d7280b2 script/release.sh: use 8 byte gpg key ids from 08978cd ldb-samba: Add "secret" as a value to hide in LDIF files https://git.samba.org/?p=samba.git;a=shortlog;h=v4-3-test - Log - commit d7280b2eec89ddda4558275139d88382fe7be2bb Author: Stefan MetzmacherDate: Fri Sep 2 08:47:56 2016 +0200 script/release.sh: use 8 byte gpg key ids Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Sep 2 22:05:33 CEST 2016 on sn-devel-144 (cherry picked from commit e0ef054fa94b0dd56ec7bf92ffea0a6d7609da56) Autobuild-User(v4-3-test): Stefan Metzmacher Autobuild-Date(v4-3-test): Mon Sep 5 22:58:16 CEST 2016 on sn-devel-104 --- Summary of changes: script/release.sh | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/script/release.sh b/script/release.sh index e5d93a7..da973b5 100755 --- a/script/release.sh +++ b/script/release.sh @@ -656,7 +656,7 @@ announcement_samba_rc() { echo "" echo "" echo "The uncompressed tarballs and patch files have been signed" - echo "using GnuPG (ID 6568B7EA). The source code can be downloaded" + echo "using GnuPG (ID ${GPG_KEYID}). The source code can be downloaded" echo "from:" echo "" echo "${download_url}" @@ -805,7 +805,7 @@ announcement_samba_stable() { echo "" echo "" echo "The uncompressed tarballs and patch files have been signed" - echo "using GnuPG (ID 6568B7EA). The source code can be downloaded" + echo "using GnuPG (ID ${GPG_KEYID}). The source code can be downloaded" echo "from:" echo "" echo "${release_url}" @@ -1012,7 +1012,7 @@ talloc | tdb | tevent | ldb) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='13084025' + GPG_KEYID='4793916113084025' } productbase="${product}" @@ -1031,7 +1031,7 @@ samba-rc) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='6568B7EA' + GPG_KEYID='6F33915B6568B7EA' } productbase="samba" @@ -1052,7 +1052,7 @@ samba-stable) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='6568B7EA' + GPG_KEYID='6F33915B6568B7EA' } productbase="samba" @@ -1074,7 +1074,7 @@ TODO-samba-security) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='6568B7EA' + GPG_KEYID='6F33915B6568B7EA' } productbase="samba" -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 7c84cb5 wafsamba: add -Werror=format-security to the developer build from ec45579 selftest: detect older tshark version https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7c84cb54fc34bdd1c4d79cd6b588256c9bacc705 Author: Stefan MetzmacherDate: Fri Sep 2 17:23:28 2016 +0200 wafsamba: add -Werror=format-security to the developer build Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Mon Sep 5 20:23:00 CEST 2016 on sn-devel-144 --- Summary of changes: buildtools/wafsamba/samba_autoconf.py | 1 + 1 file changed, 1 insertion(+) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 5f35d77..795d130 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -708,6 +708,7 @@ def SAMBA_CONFIG_H(conf, path=None): testflags=True) conf.ADD_CFLAGS('-Wformat=2 -Wno-format-y2k', testflags=True) +conf.ADD_CFLAGS('-Werror=format-security -Wformat-security', testflags=True) # This check is because for ldb_search(), a NULL format string # is not an error, but some compilers complain about that. if CHECK_CFLAGS(conf, ["-Werror=format", "-Wformat=2"], ''' -- Samba Shared Repository
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-05-1820/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-05-1820/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-05-1820/samba.stdout The top commit at the time of the failure was: commit e69715138fe14d8dc51f65cf5986b178c98f40a2 Author: Bob CampbellDate: Mon Sep 5 11:24:19 2016 +1200 copyright: Add the missing notices for garbage collect tombstones Signed-off-by: Bob Campbell Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Autobuild-User(master): Garming Sam Autobuild-Date(master): Mon Sep 5 08:14:26 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via ec45579 selftest: detect older tshark version from e697151 copyright: Add the missing notices for garbage collect tombstones https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ec455796fe91fa97acd339be24baa75358395621 Author: Uri SimchoniDate: Mon Sep 5 08:52:52 2016 +0300 selftest: detect older tshark version Detect older versions of tshark, which do not recognize the -Y option, and skip the kerberos enc type tests Signed-off-by: Uri Simchoni Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Mon Sep 5 16:31:58 CEST 2016 on sn-devel-144 --- Summary of changes: testprogs/blackbox/test_client_etypes.sh | 12 1 file changed, 12 insertions(+) Changeset truncated at 500 lines: diff --git a/testprogs/blackbox/test_client_etypes.sh b/testprogs/blackbox/test_client_etypes.sh index f424b52..57739c6 100755 --- a/testprogs/blackbox/test_client_etypes.sh +++ b/testprogs/blackbox/test_client_etypes.sh @@ -51,6 +51,18 @@ testit "testjoin" $VALGRIND $net_tool ads testjoin -kP || failed=`expr $failed + export SOCKET_WRAPPER_PCAP_FILE= testit "leave" $VALGRIND $net_tool ads leave -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1` +# +# Older versions of tshark do not support -Y option, +# They use -R which cannot be used with recent versions... +# +if ! tshark -r $pcap_file -nVY "kerberos" > /dev/null 2>&1 ; then +subunit_start_test "client encryption types" +subunit_skip_test "client encryption types" <
[SCM] Samba Shared Repository - branch v4-5-test updated
The branch, v4-5-test has been updated via 181d050 script/release.sh: use 8 byte gpg key ids from 91901e0 WHATSNEW: Start release notes for Samba 4.5.0rc4. https://git.samba.org/?p=samba.git;a=shortlog;h=v4-5-test - Log - commit 181d05005e1e5887052887a58bb33a9adc98bd92 Author: Stefan MetzmacherDate: Fri Sep 2 08:47:56 2016 +0200 script/release.sh: use 8 byte gpg key ids Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Sep 2 22:05:33 CEST 2016 on sn-devel-144 (cherry picked from commit e0ef054fa94b0dd56ec7bf92ffea0a6d7609da56) Autobuild-User(v4-5-test): Stefan Metzmacher Autobuild-Date(v4-5-test): Mon Sep 5 15:07:40 CEST 2016 on sn-devel-144 --- Summary of changes: script/release.sh | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/script/release.sh b/script/release.sh index 7db4e53..769f742 100755 --- a/script/release.sh +++ b/script/release.sh @@ -662,7 +662,7 @@ announcement_samba_rc() { echo "" echo "" echo "The uncompressed tarballs and patch files have been signed" - echo "using GnuPG (ID 6568B7EA). The source code can be downloaded" + echo "using GnuPG (ID ${GPG_KEYID}). The source code can be downloaded" echo "from:" echo "" echo "${download_url}" @@ -845,7 +845,7 @@ announcement_samba_stable() { echo "" echo "" echo "The uncompressed tarballs and patch files have been signed" - echo "using GnuPG (ID 6568B7EA). The source code can be downloaded" + echo "using GnuPG (ID ${GPG_KEYID}). The source code can be downloaded" echo "from:" echo "" echo "${release_url}" @@ -1052,7 +1052,7 @@ talloc | tdb | tevent | ldb) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='13084025' + GPG_KEYID='4793916113084025' } productbase="${product}" @@ -1071,7 +1071,7 @@ samba-rc) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='6568B7EA' + GPG_KEYID='6F33915B6568B7EA' } productbase="samba" @@ -1092,7 +1092,7 @@ samba-stable) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='6568B7EA' + GPG_KEYID='6F33915B6568B7EA' } productbase="samba" @@ -1114,7 +1114,7 @@ TODO-samba-security) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='6568B7EA' + GPG_KEYID='6F33915B6568B7EA' } productbase="samba" -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-4-test updated
The branch, v4-4-test has been updated via 28d8230 script/release.sh: use 8 byte gpg key ids from 1305ba6 libgpo: Correctly use the 'server' parameter after parsing it out of the GPO path. https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test - Log - commit 28d82306b720487ab93474171d91d318afff7b78 Author: Stefan MetzmacherDate: Fri Sep 2 08:47:56 2016 +0200 script/release.sh: use 8 byte gpg key ids Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Sep 2 22:05:33 CEST 2016 on sn-devel-144 (cherry picked from commit e0ef054fa94b0dd56ec7bf92ffea0a6d7609da56) Autobuild-User(v4-4-test): Stefan Metzmacher Autobuild-Date(v4-4-test): Mon Sep 5 14:59:12 CEST 2016 on sn-devel-144 --- Summary of changes: script/release.sh | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/script/release.sh b/script/release.sh index 7db4e53..769f742 100755 --- a/script/release.sh +++ b/script/release.sh @@ -662,7 +662,7 @@ announcement_samba_rc() { echo "" echo "" echo "The uncompressed tarballs and patch files have been signed" - echo "using GnuPG (ID 6568B7EA). The source code can be downloaded" + echo "using GnuPG (ID ${GPG_KEYID}). The source code can be downloaded" echo "from:" echo "" echo "${download_url}" @@ -845,7 +845,7 @@ announcement_samba_stable() { echo "" echo "" echo "The uncompressed tarballs and patch files have been signed" - echo "using GnuPG (ID 6568B7EA). The source code can be downloaded" + echo "using GnuPG (ID ${GPG_KEYID}). The source code can be downloaded" echo "from:" echo "" echo "${release_url}" @@ -1052,7 +1052,7 @@ talloc | tdb | tevent | ldb) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='13084025' + GPG_KEYID='4793916113084025' } productbase="${product}" @@ -1071,7 +1071,7 @@ samba-rc) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='6568B7EA' + GPG_KEYID='6F33915B6568B7EA' } productbase="samba" @@ -1092,7 +1092,7 @@ samba-stable) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='6568B7EA' + GPG_KEYID='6F33915B6568B7EA' } productbase="samba" @@ -1114,7 +1114,7 @@ TODO-samba-security) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='6568B7EA' + GPG_KEYID='6F33915B6568B7EA' } productbase="samba" -- Samba Shared Repository
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-05-1355/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-05-1355/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-05-1355/samba.stdout The top commit at the time of the failure was: commit e69715138fe14d8dc51f65cf5986b178c98f40a2 Author: Bob CampbellDate: Mon Sep 5 11:24:19 2016 +1200 copyright: Add the missing notices for garbage collect tombstones Signed-off-by: Bob Campbell Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Autobuild-User(master): Garming Sam Autobuild-Date(master): Mon Sep 5 08:14:26 CEST 2016 on sn-devel-144
autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2016-09-05-1107/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2016-09-05-1107/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2016-09-05-1107/samba.stdout The top commit at the time of the failure was: commit e0ef054fa94b0dd56ec7bf92ffea0a6d7609da56 Author: Stefan MetzmacherDate: Fri Sep 2 08:47:56 2016 +0200 script/release.sh: use 8 byte gpg key ids Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Sep 2 22:05:33 CEST 2016 on sn-devel-144
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-05-1020/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-05-1020/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-09-05-1020/samba.stdout The top commit at the time of the failure was: commit e0ef054fa94b0dd56ec7bf92ffea0a6d7609da56 Author: Stefan MetzmacherDate: Fri Sep 2 08:47:56 2016 +0200 script/release.sh: use 8 byte gpg key ids Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Sep 2 22:05:33 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via e697151 copyright: Add the missing notices for garbage collect tombstones via 2dfedff dsdb: refactor part of garbage_collect_tombstones into new function from e0ef054 script/release.sh: use 8 byte gpg key ids https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e69715138fe14d8dc51f65cf5986b178c98f40a2 Author: Bob CampbellDate: Mon Sep 5 11:24:19 2016 +1200 copyright: Add the missing notices for garbage collect tombstones Signed-off-by: Bob Campbell Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Autobuild-User(master): Garming Sam Autobuild-Date(master): Mon Sep 5 08:14:26 CEST 2016 on sn-devel-144 commit 2dfedffb740ecfe898945a9fc47b24e3c8328d7e Author: Bob Campbell Date: Mon Sep 5 10:48:13 2016 +1200 dsdb: refactor part of garbage_collect_tombstones into new function Pair-programmed-with: Garming Sam Signed-off-by: Bob Campbell Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett --- Summary of changes: source4/dsdb/kcc/garbage_collect_tombstones.c | 387 +++--- 1 file changed, 218 insertions(+), 169 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/kcc/garbage_collect_tombstones.c b/source4/dsdb/kcc/garbage_collect_tombstones.c index 8d2ea8b..ad14d5e 100644 --- a/source4/dsdb/kcc/garbage_collect_tombstones.c +++ b/source4/dsdb/kcc/garbage_collect_tombstones.c @@ -4,6 +4,8 @@ handle removal of deleted objects Copyright (C) 2009 Andrew Tridgell + Copyright (C) 2016 Andrew Bartlett + Copyright (C) 2016 Catalyst.NET Ltd This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,6 +35,209 @@ #include "lib/ldb-samba/ldb_matching_rules.h" #include "lib/util/time.h" +static NTSTATUS garbage_collect_tombstones_part(TALLOC_CTX *mem_ctx, + struct ldb_context *samdb, + struct dsdb_ldb_dn_list_node *part, + char *filter, + unsigned int *num_links_removed, + unsigned int *num_objects_removed, + struct dsdb_schema *schema, + const char **attrs, + char **error_string, + NTTIME expunge_time_nttime) +{ + int ret; + struct ldb_dn *do_dn; + struct ldb_result *res; + unsigned int i, j, k; + uint32_t flags; + TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx); + if (!tmp_ctx) { + return NT_STATUS_NO_MEMORY; + } + + ret = dsdb_get_deleted_objects_dn(samdb, tmp_ctx, part->dn, _dn); + if (ret != LDB_SUCCESS) { + TALLOC_FREE(tmp_ctx); + /* some partitions have no Deleted Objects + container */ + return NT_STATUS_OK; + } + + DEBUG(1, ("Doing a full scan on %s and looking for deleted objects\n", + ldb_dn_get_linearized(part->dn))); + + flags = DSDB_SEARCH_SHOW_RECYCLED | + DSDB_SEARCH_SHOW_DN_IN_STORAGE_FORMAT | + DSDB_SEARCH_REVEAL_INTERNALS; + ret = dsdb_search(samdb, tmp_ctx, , part->dn, LDB_SCOPE_SUBTREE, + attrs, flags, "%s", filter); + + if (ret != LDB_SUCCESS) { + *error_string = talloc_asprintf(mem_ctx, + "Failed to search for deleted " + "objects in %s: %s", + ldb_dn_get_linearized(do_dn), + ldb_errstring(samdb)); + TALLOC_FREE(tmp_ctx); + return NT_STATUS_INTERNAL_ERROR; + } + + for (i=0; icount; i++) { + struct ldb_message *cleanup_msg = NULL; + unsigned int num_modified = 0; + + bool isDeleted = ldb_msg_find_attr_as_bool(res->msgs[i], + "isDeleted", false); + if (isDeleted) { + if (ldb_dn_compare(do_dn, res->msgs[i]->dn) == 0) { + /* Skip the Deleted Object Container */ +