[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, samba_4.0, updated. upstream/4.0.6+dfsg-834-gbcda6d6

[Andrew Bartlett]

The following commit has been merged in the samba_4.0 branch:
commit f68a660440a4267d89aff2fbd48afa705677bf68
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Jun 13 14:27:45 2013 +1000

    Do not start smbd/nmbd/winbind when we are an AD DC

diff --git a/debian/samba-ad-dc.init b/debian/samba-ad-dc.init
index 4930d69..490b15b 100644
--- a/debian/samba-ad-dc.init
+++ b/debian/samba-ad-dc.init
@@ -27,6 +27,11 @@ test -x /usr/sbin/samba -a -r /etc/samba/smb.conf || exit 0
 
 case "$1" in
 	start)
+	        SERVER_ROLE=`samba-tool testparm --parameter-name="server role"  2>/dev/null | tail -1`
+		if [ "$SERVER_ROLE" != "active directory domain controller" ]; then
+		    exit 0
+		fi
+
 		log_daemon_msg "Starting Samba AD DC daemon" "samba"
 		# Make sure we have our PIDDIR, even if it's on a tmpfs
 		install -o root -g root -m 755 -d $PIDDIR
diff --git a/debian/samba.init b/debian/samba.init
index 52b1168..d7e7264 100644
--- a/debian/samba.init
+++ b/debian/samba.init
@@ -26,6 +26,11 @@ test -x /usr/sbin/nmbd -a -x /usr/sbin/smbd || exit 0
 
 case "$1" in
 	start)
+		SERVER_ROLE=`samba-tool testparm --parameter-name="server role"  2>/dev/null | tail -1`
+		if [ "$SERVER_ROLE" = "active directory domain controller" ]; then
+		    exit 0
+		fi
+
 		log_daemon_msg "Starting Samba daemons"
 		# Make sure we have our PIDDIR, even if it's on a tmpfs
 		install -o root -g root -m 755 -d $PIDDIR
diff --git a/debian/winbind.init b/debian/winbind.init
index 49062c0..ce0171d 100644
--- a/debian/winbind.init
+++ b/debian/winbind.init
@@ -25,6 +25,11 @@ unset TMPDIR
 # See if the daemon is there
 test -x $DAEMON || exit 0
 
+SERVER_ROLE=`samba-tool testparm --parameter-name="server role"  2>/dev/null | tail -1`
+if [ "$SERVER_ROLE" = "active directory domain controller" ]; then
+    exit 0
+fi
+
 . /lib/lsb/init-functions
 
 case "$1" in

-- 
Debian packaging for Samba