[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 6a6f095 samba-tool domain schemaupgrade: Avoid reindex after every hunk from fafc6da ldapcmp: Improve the difference checker of ldapcmp for 2012 R2 https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 6a6f0952a5769628bfa07d1bf1c04bd23d827492 Author: Andrew Bartlett Date: Thu Dec 21 12:07:46 2017 +1300 samba-tool domain schemaupgrade: Avoid reindex after every hunk This takes advantage of the fact that a single LDB operation is atomic even inside our transaction and so we can retry it after updating the schema. This makes the smaba-tool domain schemaupgrade take 1m30s compared with 4m4s. Signed-off-by: Andrew Bartlett Reviewed-by: Garming Sam Autobuild-User(master): Garming Sam Autobuild-Date(master): Thu Dec 21 08:28:51 CET 2017 on sn-devel-144 --- Summary of changes: python/samba/netcmd/domain.py | 21 +++-- 1 file changed, 15 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index a3dd565..ada7d6b 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -3915,7 +3915,21 @@ schemaUpdateNow: 1 """Applies a single LDIF update to the schema""" try: -samdb.modify_ldif(self.ldif, controls=['relax:0']) +try: +samdb.modify_ldif(self.ldif, controls=['relax:0']) +except ldb.LdbError as e: +if e.args[0] == ldb.ERR_INVALID_ATTRIBUTE_SYNTAX: + +# REFRESH after a failed change + +# Otherwise the OID-to-attribute mapping in +# _apply_updates_in_file() won't work, because it +# can't lookup the new OID in the schema +self._ldap_schemaUpdateNow(samdb) + +samdb.modify_ldif(self.ldif, controls=['relax:0']) +else: +raise except ldb.LdbError as e: if self.can_ignore_failure(e): return 0 @@ -3927,11 +3941,6 @@ schemaUpdateNow: 1 raise -# REFRESH AFTER EVERY CHANGE -# Otherwise the OID-to-attribute mapping in _apply_updates_in_file() -# won't work, because it can't lookup the new OID in the schema -self._ldap_schemaUpdateNow(samdb) - return 1 class cmd_domain_schema_upgrade(Command): -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via fafc6da ldapcmp: Improve the difference checker of ldapcmp for 2012 R2 via c4895cf upgradeprovision: Mark tests as passing again (using functional prep) via aee8464 functionalprep.sh: Add a test to show that functional prep works on old databases via 87eeb89 functionalprep.sh: New test for ensuring that the prep works correctly via 03f1ca8 release-4-8-0-pre1: New database dump for checking that functional prep works via c419ac4 domain.py: Command for prepping the domain for higher functional levels via b2d831f domain.py: Force schema upgrade to be used only on the schema master via 6689570 forest_update: Allow the script to add the missing forest containers via c426275 forest_update: Create a module to apply forest prep updates via 107fbaa domain_update: Add a new docstring for the main entry point via b5f7677 domain_update: Add an additional error with revision via 60b70e9 domain_update: Allow the revision version to be set via 551ec22 domain_update: Respect the fix=False flag via 23dbcb4 domain_update: Create a module to apply domain prep updates via 8a4085f ms_forest_updates_markdown: Write a parser for the forest updates .md via 87cbd97 WindowsServerDocs: Update README for clarity via 7cc1dfe Forest-Wide-Updates.md: Include the description of forest wide updates via b6c33c0 WindowsServerDocs: Update README to get rid of the references to ./gen/ via 1bb0715 2008R2: Missing operation (77) for ActiveDirectoryUpdate version 5 (FL) via 3cddb6a 2008R2: Missing operation (75, 76) for ActiveDirectoryUpdate version 5 (FL) via 0efc061 ldapcmp: Add otherWellKnownObjects to ignore when using --two via 83c4c3b sambadns: Allow functional level 2016 (when added) via 1f63ffc wscript: Install missing .ldf files from 576fb4f g_lock: fix cleanup of stale entries in g_lock_trylock() https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit fafc6da6ab6c30a5976163957836e42bdffad268 Author: Garming Sam Date: Mon Dec 18 12:45:02 2017 +1300 ldapcmp: Improve the difference checker of ldapcmp for 2012 R2 There are a number of new attributes which may be considered DNs. Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Autobuild-User(master): Garming Sam Autobuild-Date(master): Thu Dec 21 03:41:19 CET 2017 on sn-devel-144 commit c4895cfd9ae77b980ed47d0e08d9b19d850a9e65 Author: Garming Sam Date: Mon Dec 18 12:30:44 2017 +1300 upgradeprovision: Mark tests as passing again (using functional prep) Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett commit aee8464aaa01a1740eeab6e47d76621d8e7c740c Author: Garming Sam Date: Mon Dec 18 12:30:15 2017 +1300 functionalprep.sh: Add a test to show that functional prep works on old databases Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett commit 87eeb897e4f9fae635c55940cedbc1501e529cd1 Author: Garming Sam Date: Fri Dec 15 15:43:32 2017 +1300 functionalprep.sh: New test for ensuring that the prep works correctly Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett commit 03f1ca863a8e10cb261105f5cc40f7c25ea09c02 Author: Garming Sam Date: Fri Dec 15 14:33:45 2017 +1300 release-4-8-0-pre1: New database dump for checking that functional prep works Next will be a test which compares the current run of the script against this reference provision. Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett commit c419ac4a2e915b999064c1dc0ee5ff34d3803580 Author: Garming Sam Date: Wed Dec 6 14:12:30 2017 +1300 domain.py: Command for prepping the domain for higher functional levels Currently we support the 2012 and 2012 R2 prep levels. Forest prep requires use of the schema master role. Domain prep requires use of the infrastructure master role. Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett commit b2d831f23d5a5513b4d4c767dbfe5de555afae30 Author: Garming Sam Date: Wed Dec 13 15:27:20 2017 +1300 domain.py: Force schema upgrade to be used only on the schema master While this may be enforced at lower levels, it would be better to warn earlier rather than later. Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett commit 66895701c9ed14fa17682d280e7008e417afafa0 Author: Garming Sam Date: Wed Dec 13 12:09:02 2017 +1300 forest_update: Allow the script to add the missing forest containers Before we set the prep level higher in default provisions, we should add these objects to the initial ldif (so that our initial ldif represents a full 2008R2 domain which we build consistently on). Signed-off-by
[SCM] Samba Shared Repository - branch v4-7-test updated
The branch, v4-7-test has been updated
via edc0c99 s4:samba: Fix default to be running samba as a deamon
from 1eb0844 messaging: Always register the unique id
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-7-test
- Log -
commit edc0c992e0ddbd305e4a70939dac6a0691db5cf2
Author: Andrew Bartlett
Date: Tue Dec 19 16:30:08 2017 +1300
s4:samba: Fix default to be running samba as a deamon
Commit 8736013dc42c5755b75bbb2e843a290bcd545909 got the (confusing) sense
of opt_fork
wrong.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13129
Signed-off-by: Andrew Bartlett
Reviewed-by: Garming Sam
Autobuild-User(master): Andrew Bartlett
Autobuild-Date(master): Tue Dec 19 11:24:29 CET 2017 on sn-devel-144
(cherry picked from commit 0806ff7dfd3f982226e4cd9b923a0e570b765f0c)
Autobuild-User(v4-7-test): Karolin Seeger
Autobuild-Date(v4-7-test): Thu Dec 21 00:55:29 CET 2017 on sn-devel-144
---
Summary of changes:
source4/smbd/server.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 2349d5c..b57ee4c 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -429,7 +429,7 @@ static int binary_smbd_main(const char *binary_name,
"not allowed together with -D|--daemon\n\n");
poptPrintUsage(pc, stderr, 0);
return 1;
- } else if (!opt_interactive && !opt_fork) {
+ } else if (!opt_interactive && opt_fork) {
/* default is --daemon */
opt_daemon = true;
}
--
Samba Shared Repository
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/2017-12-20-2210/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2017-12-20-2210/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2017-12-20-2210/samba.stdout The top commit at the time of the failure was: commit 676261fa08273114b888bb46f65de3de091b615b Author: Jamie McClymont Date: Fri Dec 8 15:20:36 2017 +1300 selftest: replace global with explicit environment variables This patch removes setting of NSS_WRAPPER and RESOLV_WRAPPER variables globally in Samba3.pm (because setting them persistently/globally can create hidden ordering dependencies). Instead, they are set on subprocesses as required, which appears to be the following two places (aside from those places where they are already set explicitly): * calls to createuser in provision * calls to wbinfo --ping-dc in wait_for_start Signed-off-by: Jamie McClymont Reviewed-by: Garming Sam Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Wed Dec 20 08:50:26 CET 2017 on sn-devel-144
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 04ed364 Add Samba 4.6.12. via 5214a65 NEWS[4.6.12]: Samba 4.6.12 Available for Download from dd8b73c Revert "samba.entities: Add doc.version entity." https://git.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 04ed3644b202d1d06caa06f69be0a297dbb2eb56 Author: Karolin Seeger Date: Wed Dec 20 21:44:27 2017 +0100 Add Samba 4.6.12. Signed-off-by: Karolin Seeger commit 5214a65b69fa615ef4b7e9d9834927d2a08b8820 Author: Karolin Seeger Date: Wed Dec 20 21:42:09 2017 +0100 NEWS[4.6.12]: Samba 4.6.12 Available for Download Signed-off-by: Karolin Seeger --- Summary of changes: history/header_history.html | 1 + history/samba-4.6.12.html| 94 posted_news/20171220-204342.4.6.12.body.html | 13 posted_news/20171220-204342.4.6.12.headline.html | 3 + 4 files changed, 111 insertions(+) create mode 100644 history/samba-4.6.12.html create mode 100644 posted_news/20171220-204342.4.6.12.body.html create mode 100644 posted_news/20171220-204342.4.6.12.headline.html Changeset truncated at 500 lines: diff --git a/history/header_history.html b/history/header_history.html index fea500a..643ca6f 100755 --- a/history/header_history.html +++ b/history/header_history.html @@ -13,6 +13,7 @@ samba-4.7.2 samba-4.7.1 samba-4.7.0 + samba-4.6.12 samba-4.6.11 samba-4.6.10 samba-4.6.9 diff --git a/history/samba-4.6.12.html b/history/samba-4.6.12.html new file mode 100644 index 000..b58f88f --- /dev/null +++ b/history/samba-4.6.12.html @@ -0,0 +1,94 @@ +http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +http://www.w3.org/1999/xhtml";> + +Samba 4.6.12 - Release Notes + + +Samba 4.6.12 Available for Download + +https://download.samba.org/pub/samba/stable/samba-4.6.12.tar.gz";>Samba 4.6.12 (gzipped) +https://download.samba.org/pub/samba/stable/samba-4.6.12.tar.asc";>Signature + + +https://download.samba.org/pub/samba/patches/samba-4.6.11-4.6.12.diffs.gz";>Patch (gzipped) against Samba 4.6.11 +https://download.samba.org/pub/samba/patches/samba-4.6.11-4.6.12.diffs.asc";>Signature + + + + == + Release Notes for Samba 4.6.12 + December 20, 2017 + = + + +This is the latest stable release of the Samba 4.6 release series. + + +smbclient reparse point symlink parameters reversed +=== + +A bug in smbclient caused the 'symlink' command to reverse the +meaning of the new name and link target parameters when creating a +reparse point symlink against a Windows server. + +This only affects using the smbclient 'symlink' command against +a Windows server, not a Samba server using the UNIX extensions +(the parameter order is correct in that case) so no existing +user scripts that depend on creating symlinks on Samba servers +need to change. + +As this is a little used feature the ordering of these parameters +has been reversed to match the parameter ordering of the UNIX +extensions 'symlink' command. This means running 'symlink' against +both Windows and Samba now uses the same paramter ordering in both +cases. + +The usage message for this command has also been improved to remove confusion. + + +Changes since 4.6.11: +- + +o Jeremy Allison <j...@samba.org> + * BUG 13140: s3: smbclient: Implement 'volume' command over SMB2. + * BUG 13171: s3: libsmb: Fix valgrind read-after-free error in + cli_smb2_close_fnum_recv(). + * BUG 13172: s3: libsmb: Fix reversing of oldname/newname paths when creating + a reparse point symlink on Windows from smbclient. + +o Timur I. Bakeyev <ti...@ixsystems.com> + * BUG 12934: Build man page for vfs_zfsacl.8 with Samba. + +o Ralph Boehme <s...@samba.org> + * BUG 6133: vfs_zfsacl: Fix compilation error. + * BUG 13051: "smb encrypt" setting changes are not fully applied until full + smbd restart. + * BUG 13052: winbindd: Fix idmap_rid dependency on trusted domain list. + * BUG 13155: vfs_fruit: Proper VFS-stackable conversion of FinderInfo. + +o Amitay Isaacs <ami...@gmail.com> + * BUG 13153: ctdb: sock_daemon leaks memory. + * BUG 13154: TCP tickles not getting synchronised on CTDB restart. + +o Volker Lendecke <v...@samba.org> + * BUG 13150: winbindd: Parent and child share a ctdb connection. + * BUG 13179: pthreadpool: Fix starvat
[SCM] Samba Shared Repository - annotated tag samba-4.6.12 created
The annotated tag, samba-4.6.12 has been created at 267a5c7d1b0ef7f554b69357fccc3a45204df21e (tag) tagging 1377b56d38f17ee1981b4bde8defb9d759f60c50 (commit) replaces samba-4.6.11 tagged by Karolin Seeger on Wed Dec 20 21:41:53 2017 +0100 - Log - samba: tag release samba-4.6.12 -BEGIN PGP SIGNATURE- iEYEABECAAYFAlo6yxMACgkQbzORW2Vot+omiQCfTkpVfH3KOqokQtFBwiTiWdkX xwcAn35OXCp/d7itOOHecTyJF7CNFxT1 =3qhZ -END PGP SIGNATURE- Amitay Isaacs (5): ctdb-daemon: Allocate deferred calls off calling context ctdb-common: Call missing tevent_wakeup_recv() in sock_daemon ctdb-takeover: Refactor code to send tickle lists for all public IPs ctdb-takeover: Send tcp tickles immediately on STARTUP control ctdb-daemon: Send STARTUP control after startup event Christof Schmitt (2): pthreadpool: Move creating of thread to new function pthreadpool: Undo put_job when returning error Jeremy Allison (7): libsmbclient: Allow server (NetApp) to return STATUS_INVALID_PARAMETER from an echo. s3: libsmb: smbc_statvfs is missing the supporting SMB2 calls. s3: smbclient: Implement "volume" command over SMB2. s3: smbclient: tests: Test "volume" command over SMB1 and SMB2+. s3: libsmb: Fix valgrind read-after-free error in cli_smb2_close_fnum_recv(). s3: client: Rename to in cmd_symlink() and cli_posix_symlink(). s3: libsmb: Fix reversing of oldname/newname paths when creating a reparse point symlink on Windows from smbclient. Karolin Seeger (5): VERSION: Bump version up to 4.6.11... Merge tag 'samba-4.6.11' into v4-6-test VERSION: Bump version up to 4.6.12... WHATSNEW: Add release notes for Samba 4.6.12. VERSION: Disable GIT_SNAPSHOT for the 4.6.12 release. Noel Power (3): s3:libads: net ads keytab list fails with "Key table name malformed" testprogs: Test net ads keytab list testprogs: Fix a typo in the net ads test Ralph Boehme (19): s3/loadparm: allocate a fresh sDefault object per lp_ctx s3/loadparm: ensure default service options are not changed s3/loadparm: don't mark IPC$ as autoloaded selftest: reorder arguments for fruit tests selftest: add localdir option to fruit subtests s4/torture: rework stream names tests usage of local xattr call s4/torture: use torture_assert_goto in a vfs.fruit test selftest: run AppleDouble sidecar-file conversion test runs against all fruit shares s4/torture: let write_stream() deal with stream=NULL selftest: add "fruit:veto_appledouble = no" to fruit shares s4/torture: fruit: remove use of localdir from test_adouble_conversion test s4/torture: fruit: in test_adouble_conversion() also check stream list and AFPINFO_STREAM vfs_fruit: add AfpInfo prototypes vfs_fruit: proper VFS-stackable conversion of FinderInfo vfs_zfsacl: fix compilation error winbindd: add domain SID to idmap mapping domains winbindd: pass domain SID to wbint_UnixIDs2Sids winbindd: idmap_rid: don't rely on the static domain list winbindd: idmap_rid: error code for failing id-to-sid mapping request Stefan Metzmacher (2): s3:selftest: add samba3.blackbox.net_rpc_oldjoin test libnet_join: fix "net rpc oldjoin" Timur I. Bakeyev (2): Fix typo in the "wide links" description for the getwd cache. Add vfs_zfsacl manpage to the list of manpages if we have this module enabled. Volker Lendecke (7): winbind: Replace winbind_event_context with server_event_context winbind: Remove winbind_event_context winbind: winbind_messaging_context -> server_messaging_context winbind: Remove winbind_messaging_context pthreadpool: Fix starvation after fork pthreadpool: Add a test for the race condition fixed in the last commit messaging: Always register the unique id --- -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-6-test updated
The branch, v4-6-test has been updated via 51fb772 VERSION: Bump version up to 4.6.13... from 1377b56 VERSION: Disable GIT_SNAPSHOT for the 4.6.12 release. https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test - Log - commit 51fb772b3b3107a05a8139796b50e2d991213f74 Author: Karolin Seeger Date: Wed Dec 20 21:33:54 2017 +0100 VERSION: Bump version up to 4.6.13... and re-enable GIT_SNAPSHOT. Signed-off-by: Karolin Seeger --- Summary of changes: VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/VERSION b/VERSION index 0c4ca38..43168e5 100644 --- a/VERSION +++ b/VERSION @@ -25,7 +25,7 @@ SAMBA_VERSION_MAJOR=4 SAMBA_VERSION_MINOR=6 -SAMBA_VERSION_RELEASE=12 +SAMBA_VERSION_RELEASE=13 # If a official release has a serious bug # @@ -99,7 +99,7 @@ SAMBA_VERSION_RC_RELEASE= # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes # # -> "3.0.0-SVN-build-199" # -SAMBA_VERSION_IS_GIT_SNAPSHOT=no +SAMBA_VERSION_IS_GIT_SNAPSHOT=yes # This is for specifying a release nickname# -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-6-test updated
The branch, v4-6-test has been updated via 1377b56 VERSION: Disable GIT_SNAPSHOT for the 4.6.12 release. via d665971 WHATSNEW: Add release notes for Samba 4.6.12. from d9aaf8d messaging: Always register the unique id https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test - Log - commit 1377b56d38f17ee1981b4bde8defb9d759f60c50 Author: Karolin Seeger Date: Wed Dec 20 21:30:24 2017 +0100 VERSION: Disable GIT_SNAPSHOT for the 4.6.12 release. Signed-off-by: Karolin Seeger commit d6659710304947e9e5a639161acd26462bd07fa2 Author: Karolin Seeger Date: Wed Dec 20 21:29:41 2017 +0100 WHATSNEW: Add release notes for Samba 4.6.12. Signed-off-by: Karolin Seeger --- Summary of changes: VERSION | 2 +- WHATSNEW.txt | 99 ++-- 2 files changed, 98 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/VERSION b/VERSION index 7051e63..0c4ca38 100644 --- a/VERSION +++ b/VERSION @@ -99,7 +99,7 @@ SAMBA_VERSION_RC_RELEASE= # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes # # -> "3.0.0-SVN-build-199" # -SAMBA_VERSION_IS_GIT_SNAPSHOT=yes +SAMBA_VERSION_IS_GIT_SNAPSHOT=no # This is for specifying a release nickname# diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 8199d91..a759fa9 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,99 @@ == + Release Notes for Samba 4.6.12 + December 20, 2017 + = + + +This is the latest stable release of the Samba 4.6 release series. + + +smbclient reparse point symlink parameters reversed +=== + +A bug in smbclient caused the 'symlink' command to reverse the +meaning of the new name and link target parameters when creating a +reparse point symlink against a Windows server. + +This only affects using the smbclient 'symlink' command against +a Windows server, not a Samba server using the UNIX extensions +(the parameter order is correct in that case) so no existing +user scripts that depend on creating symlinks on Samba servers +need to change. + +As this is a little used feature the ordering of these parameters +has been reversed to match the parameter ordering of the UNIX +extensions 'symlink' command. This means running 'symlink' against +both Windows and Samba now uses the same paramter ordering in both +cases. + +The usage message for this command has also been improved to remove confusion. + + +Changes since 4.6.11: +- + +o Jeremy Allison + * BUG 13140: s3: smbclient: Implement 'volume' command over SMB2. + * BUG 13171: s3: libsmb: Fix valgrind read-after-free error in + cli_smb2_close_fnum_recv(). + * BUG 13172: s3: libsmb: Fix reversing of oldname/newname paths when creating + a reparse point symlink on Windows from smbclient. + +o Timur I. Bakeyev + * BUG 12934: Build man page for vfs_zfsacl.8 with Samba. + +o Ralph Boehme + * BUG 6133: vfs_zfsacl: Fix compilation error. + * BUG 13051: "smb encrypt" setting changes are not fully applied until full + smbd restart. + * BUG 13052: winbindd: Fix idmap_rid dependency on trusted domain list. + * BUG 13155: vfs_fruit: Proper VFS-stackable conversion of FinderInfo. + +o Amitay Isaacs + * BUG 13153: ctdb: sock_daemon leaks memory. + * BUG 13154: TCP tickles not getting synchronised on CTDB restart. + +o Volker Lendecke + * BUG 13150: winbindd: Parent and child share a ctdb connection. + * BUG 13179: pthreadpool: Fix starvation after fork. + * BUG 13180: ctdb: Messaging initialisation for CTDB does not register + unique ID. + +o Stefan Metzmacher + * BUG 13149: libnet_join: Fix 'net rpc oldjoin'. + +o Noel Power + * BUG 13166: s3:libads: net ads keytab list fails with "Key table name + malformed". + +o Christof Schmitt + * BUG 13170: pthreadpool: Undo put_job when returning error. + + +### +Reporting bugs & Development Discussion +### + +Please discuss this release on the samba-technical mailing list or by +joining the #samba-technical IRC channel on irc.freenode.net. + +If you do report problems then please try to send high quality +feedback. If you don't provide vital information to help us track down +the problem then you will probably be ignored. All bug reports should +be filed under the "Samba 4.1 and newer" product in the project's Bugzilla +database (https://bugzilla.samba.org/). + + +=
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 576fb4f g_lock: fix cleanup of stale entries in g_lock_trylock()
via 1b1f9bf torture3: add LOCAL-G-LOCK6 test
via 23a62c9 dsdb: Improve code and directly close fp
via 287236e dsdb: Fix CID 1426728 Structurally dead code
via 3242bce dsdb: Fix CID 1426727 Resource leak
from 676261f selftest: replace global with explicit environment variables
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 576fb4fb5dc506bf55e5cf87973999dca444149b
Author: Stefan Metzmacher
Date: Wed Dec 20 08:25:19 2017 +0100
g_lock: fix cleanup of stale entries in g_lock_trylock()
g_lock_trylock() always incremented the counter 'i', even after cleaning a
stale
entry at position 'i', which means it skipped checking for a conflict
against
the new entry at position 'i'.
As result a process could get a write lock, while there're still
some read lock holders. Once we get into that problem, also more than
one write lock are possible.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13195
Signed-off-by: Stefan Metzmacher
Reviewed-by: Volker Lendecke
Autobuild-User(master): Volker Lendecke
Autobuild-Date(master): Wed Dec 20 20:31:48 CET 2017 on sn-devel-144
commit 1b1f9bfd294a1cc2c7892cd5aa7bf62f6d18dcb4
Author: Stefan Metzmacher
Date: Wed Dec 20 09:44:40 2017 +0100
torture3: add LOCAL-G-LOCK6 test
This is a regression test for bug #13195.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13195
Signed-off-by: Stefan Metzmacher
Reviewed-by: Volker Lendecke
commit 23a62c9f831d5deec753dea9b1c60b8ac7601d14
Author: Andreas Schneider
Date: Tue Dec 19 15:42:14 2017 +0100
dsdb: Improve code and directly close fp
Signed-off-by: Andreas Schneider
Reviewed-by: Volker Lendecke
commit 287236eac9267977735935ead4e68b2dc2f3468b
Author: Volker Lendecke
Date: Tue Dec 19 14:13:37 2017 +0100
dsdb: Fix CID 1426728 Structurally dead code
Signed-off-by: Volker Lendecke
Reviewed-by: Andreas Schneider
commit 3242bce63630c69a9221ad397d9e07560ff17769
Author: Volker Lendecke
Date: Tue Dec 19 14:11:24 2017 +0100
dsdb: Fix CID 1426727 Resource leak
Signed-off-by: Volker Lendecke
Reviewed-by: Andreas Schneider
---
Summary of changes:
source3/lib/g_lock.c | 6 +-
source3/selftest/tests.py | 1 +
source3/torture/proto.h| 1 +
source3/torture/test_g_lock.c | 152 +
source3/torture/torture.c | 1 +
source4/dsdb/samdb/ldb_modules/encrypted_secrets.c | 7 +-
6 files changed, 162 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 50ea566..68a9ab3 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -230,7 +230,9 @@ static NTSTATUS g_lock_trylock(struct db_record *rec,
struct server_id self,
}
}
- for (i=0; inum_locks = num_locks;
+}
+
+/*
+ * Test cleanup with contention and stale locks
+ */
+
+bool run_g_lock6(int dummy)
+{
+ struct tevent_context *ev = NULL;
+ struct messaging_context *msg = NULL;
+ struct g_lock_ctx *ctx = NULL;
+ const char *lockname = "lock6";
+ pid_t child;
+ int exit_pipe[2], ready_pipe[2];
+ NTSTATUS status;
+ size_t i, nprocs;
+ int ret;
+ bool ok;
+ ssize_t nread;
+ char c;
+
+ if ((pipe(exit_pipe) != 0) || (pipe(ready_pipe) != 0)) {
+ perror("pipe failed");
+ return false;
+ }
+
+ ok = get_g_lock_ctx(talloc_tos(), &ev, &msg, &ctx);
+ if (!ok) {
+ fprintf(stderr, "get_g_lock_ctx failed");
+ return false;
+ }
+
+ nprocs = 2;
+ for (i=0; ikeys[0] = key;
data->encrypt_secrets = true;
@@ -1666,8 +1665,6 @@ static int es_modify(struct ldb_module *module, struct
ldb_request *req)
}
return ldb_next_request(module, new_req);
}
- req->op.add.message = encrypted_msg;
- return ldb_next_request(module, req);
}
static int es_delete(struct ldb_module *module, struct ldb_request *req)
--
Samba Shared Repository
