From ea0764d74e1cbe7d3bef20583d21ee6abc1aec2f Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Mon, 31 Oct 2016 15:17:34 +0100
Subject: [PATCH 1/2] ctdb-scripts: Fix Debian init in samba eventscript

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12371

Signed-off-by: Mathieu Parent <math.parent@gmail.com>
Signed-off-by: Stefan Kania <stefan@kania-online.de>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 385aef614034a3f32276e19312f089990e6dbb85)
---
 ctdb/config/events.d/50.samba | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events.d/50.samba
index b521d00..4a532a4 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:
-- 
2.10.2


From 7963a308f0a27f0261d748f65989338a363ce120 Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Fri, 4 Nov 2016 11:47:18 +1100
Subject: [PATCH 2/2] 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 <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Mon Nov  7 08:01:28 CET 2016 on sn-devel-144

(cherry picked from commit 5c53d50784b2d7883f3e1d9ac48bb1fd56ba7f42)
---
 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 ++--
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100755 ctdb/tests/eventscripts/50.samba.shutdown.011.sh
 create mode 100755 ctdb/tests/eventscripts/50.samba.startup.011.sh

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 3a55e53..541474a 100755
--- a/ctdb/tests/eventscripts/etc-ctdb/rc.local
+++ b/ctdb/tests/eventscripts/etc-ctdb/rc.local
@@ -58,5 +58,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 61a033a..f90a500 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -806,7 +806,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
 
@@ -826,7 +826,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
 
-- 
2.10.2