The branch, v4-4-test has been updated via b9f3bc8 build: Fix build with perl on debian sid. via fae4f73 ctdb-tests: Add tests for updated Debian style Samba start/stop via fc465f2 ctdb-scripts: Fix Debian init in samba eventscript via 0b56446 s3: delete_streams: Don't jump to fail: - that resets state. from 4e80e19 s3-printing: Allow printer names longer than 16 chars
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test - Log ----------------------------------------------------------------- commit b9f3bc8a15569c014ffdb6f5a3d81b015ccc489b Author: Andrew Bartlett <abart...@samba.org> Date: Wed Oct 26 00:06:12 2016 +1300 build: Fix build with perl on debian sid. build: Fix build with perl on debian sid. It appears that "." is no longer in perl_inc BUG: https://bugzilla.samba.org/show_bug.cgi?id=12395 Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Martin Schwenke <mar...@meltin.net> Autobuild-User(master): Martin Schwenke <mart...@samba.org> Autobuild-Date(master): Sat Oct 29 09:32:37 CEST 2016 on sn-devel-144 (cherry picked from commit da67acbcfe2167fce9c360a55416ab10e9537a2a) Autobuild-User(v4-4-test): Karolin Seeger <ksee...@samba.org> Autobuild-Date(v4-4-test): Wed Nov 16 14:32:10 CET 2016 on sn-devel-144 commit fae4f73c1738eaf8951a33c8ff002974df1b4155 Author: Martin Schwenke <mar...@meltin.net> Date: Fri Nov 4 11:47:18 2016 +1100 ctdb-tests: Add tests for updated Debian style Samba start/stop BUG: https://bugzilla.samba.org/show_bug.cgi?id=12371 Signed-off-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> Autobuild-User(master): Amitay Isaacs <ami...@samba.org> Autobuild-Date(master): Mon Nov 7 08:01:28 CET 2016 on sn-devel-144 (cherry picked from commit 5c53d50784b2d7883f3e1d9ac48bb1fd56ba7f42) commit fc465f2571402f2b8ec51c60fdac1f5a60a34feb Author: Mathieu Parent <math.par...@gmail.com> Date: Mon Oct 31 15:17:34 2016 +0100 ctdb-scripts: Fix Debian init in samba eventscript BUG: https://bugzilla.samba.org/show_bug.cgi?id=12371 Signed-off-by: Mathieu Parent <math.par...@gmail.com> Signed-off-by: Stefan Kania <ste...@kania-online.de> Reviewed-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> (cherry picked from commit 385aef614034a3f32276e19312f089990e6dbb85) commit 0b5644637844212c5313fb62abe9432f5d2a44f8 Author: Jeremy Allison <j...@samba.org> Date: Thu Sep 29 12:44:17 2016 -0700 s3: delete_streams: Don't jump to fail: - that resets state. Signed-off-by: Jeremy Allison <j...@samba.org> BUG: https://bugzilla.samba.org/show_bug.cgi?id=12299 ----------------------------------------------------------------------- Summary of changes: buildtools/wafsamba/samba_perl.py | 3 ++- ctdb/config/events.d/50.samba | 4 ++-- ctdb/tests/eventscripts/50.samba.shutdown.011.sh | 15 +++++++++++++++ ctdb/tests/eventscripts/50.samba.startup.011.sh | 15 +++++++++++++++ ctdb/tests/eventscripts/etc-ctdb/rc.local | 2 +- ctdb/tests/eventscripts/scripts/local.sh | 4 ++-- source3/smbd/close.c | 3 ++- 7 files changed, 39 insertions(+), 7 deletions(-) create mode 100755 ctdb/tests/eventscripts/50.samba.shutdown.011.sh create mode 100755 ctdb/tests/eventscripts/50.samba.startup.011.sh Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/samba_perl.py b/buildtools/wafsamba/samba_perl.py index f2f176d..2e9a53a 100644 --- a/buildtools/wafsamba/samba_perl.py +++ b/buildtools/wafsamba/samba_perl.py @@ -49,7 +49,8 @@ def SAMBA_CHECK_PERL(conf, mandatory=True, version=(5,0,0)): conf.env.PERL_LIB_INSTALL_DIR = perl_lib_install_dir perl_inc = read_perl_config_var('print "@INC"') - perl_inc.remove('.') + if '.' in perl_inc: + perl_inc.remove('.') conf.start_msg("PERL_INC: ") conf.end_msg("%s" % (perl_inc), 'GREEN') conf.env.PERL_INC = perl_inc diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events.d/50.samba index 1742ff1..893b9c0 100755 --- a/ctdb/config/events.d/50.samba +++ b/ctdb/config/events.d/50.samba @@ -14,8 +14,8 @@ case $CTDB_INIT_STYLE in CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-nmb} ;; debian) - CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-samba} - CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""} + CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smbd} + CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-nmbd} ;; *) # Use redhat style as default: diff --git a/ctdb/tests/eventscripts/50.samba.shutdown.011.sh b/ctdb/tests/eventscripts/50.samba.shutdown.011.sh new file mode 100755 index 0000000..f225e8f --- /dev/null +++ b/ctdb/tests/eventscripts/50.samba.shutdown.011.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +. "${TEST_SCRIPTS_DIR}/unit.sh" + +define_test "shutdown, Debian init style" + +setup_samba + +export EVENTSCRIPT_TESTS_INIT_STYLE="debian" + +ok <<EOF +Stopping smbd: OK +Stopping nmbd: OK +EOF +simple_test diff --git a/ctdb/tests/eventscripts/50.samba.startup.011.sh b/ctdb/tests/eventscripts/50.samba.startup.011.sh new file mode 100755 index 0000000..3205497 --- /dev/null +++ b/ctdb/tests/eventscripts/50.samba.startup.011.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +. "${TEST_SCRIPTS_DIR}/unit.sh" + +define_test "shutdown, Debian init style" + +setup_samba + +export EVENTSCRIPT_TESTS_INIT_STYLE="debian" + +ok <<EOF +Starting nmbd: OK +Starting smbd: OK +EOF +simple_test diff --git a/ctdb/tests/eventscripts/etc-ctdb/rc.local b/ctdb/tests/eventscripts/etc-ctdb/rc.local index 0932ab4..1b5d109 100755 --- a/ctdb/tests/eventscripts/etc-ctdb/rc.local +++ b/ctdb/tests/eventscripts/etc-ctdb/rc.local @@ -63,5 +63,5 @@ background_with_logging () "$@" 2>&1 </dev/null | sed -e 's@^@\&@' } -CTDB_INIT_STYLE="redhat" +CTDB_INIT_STYLE="${EVENTSCRIPT_TESTS_INIT_STYLE:-redhat}" PATH="${EVENTSCRIPTS_PATH}:$PATH" diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index fcb7519..80230e9 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -727,7 +727,7 @@ setup_samba () eventscript_call ctdb_service_managed # All possible service names for all known distros. - for i in "smb" "nmb" "samba" ; do + for i in "smb" "nmb" "samba" "smbd" "nmbd" ; do service "$i" force-started done @@ -747,7 +747,7 @@ setup_samba () eventscript_call ctdb_service_unmanaged # All possible service names for all known distros. - for i in "smb" "nmb" "samba" ; do + for i in "smb" "nmb" "samba" "smbd" "nmbd" ; do service "$i" force-stopped done diff --git a/source3/smbd/close.c b/source3/smbd/close.c index 9d164da..1cb1601 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -182,7 +182,8 @@ NTSTATUS delete_all_streams(connection_struct *conn, const char *fname) if (!NT_STATUS_IS_OK(status)) { DEBUG(10, ("vfs_streaminfo failed: %s\n", nt_errstr(status))); - goto fail; + TALLOC_FREE(frame); + return status; } DEBUG(10, ("delete_all_streams found %d streams\n", -- Samba Shared Repository