[Pkg-samba-maint] [samba] 06/12: sysv: Use --pidfile in addition to --exec to avoid matching daemons in containers (Closes: #810794)

[Mathieu Parent]

This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch stretch
in repository samba.

commit 89cea82668bd27bd0f22796494457a293ca37224
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Wed Jun 21 21:54:03 2017 +0200

    sysv: Use --pidfile in addition to --exec to avoid matching daemons in containers (Closes: #810794)
    
    (cherry picked from commit 302e6c400106b52cbc8fab1608d70332485b1326)
---
 debian/samba.nmbd.init        | 2 +-
 debian/samba.samba-ad-dc.init | 2 +-
 debian/samba.smbd.init        | 2 +-
 debian/winbind.init           | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/samba.nmbd.init b/debian/samba.nmbd.init
index 4834858..45ee2d0 100644
--- a/debian/samba.nmbd.init
+++ b/debian/samba.nmbd.init
@@ -43,7 +43,7 @@ case $1 in
 			# Make sure we have our PIDDIR, even if it's on a tmpfs
 			install -o root -g root -m 755 -d $PIDDIR
 
-	 		if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/nmbd -- -D
+			if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/nmbd --pidfile $NMBDPID -- -D
 			then
 				log_end_msg 1
 				exit 1
diff --git a/debian/samba.samba-ad-dc.init b/debian/samba.samba-ad-dc.init
index 4408dee..437e487 100644
--- a/debian/samba.samba-ad-dc.init
+++ b/debian/samba.samba-ad-dc.init
@@ -55,7 +55,7 @@ case "$1" in
 		# Make sure we have our PIDDIR, even if it's on a tmpfs
 		install -o root -g root -m 755 -d $PIDDIR
 
-		if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/samba -- -D; then
+		if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/samba --pidfile $SAMBAPID -- -D; then
 			log_end_msg 1
 			exit 1
 		fi
diff --git a/debian/samba.smbd.init b/debian/samba.smbd.init
index f360620..59582d6 100644
--- a/debian/samba.smbd.init
+++ b/debian/samba.smbd.init
@@ -38,7 +38,7 @@ case $1 in
 		# Make sure we have our PIDDIR, even if it's on a tmpfs
 		install -o root -g root -m 755 -d $PIDDIR
 
-		if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/smbd -- -D; then
+		if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/smbd --pidfile $SMBDPID -- -D; then
 			log_end_msg 1
 			exit 1
 		fi
diff --git a/debian/winbind.init b/debian/winbind.init
index 505dcca..d16a13b 100644
--- a/debian/winbind.init
+++ b/debian/winbind.init
@@ -40,7 +40,7 @@ case "$1" in
 		fi
 		log_daemon_msg "Starting the Winbind daemon" "winbind"
 
-		start-stop-daemon --start --quiet --oknodo --exec $DAEMON -- $WINBINDD_OPTS
+		start-stop-daemon --start --quiet --oknodo --exec $DAEMON --pidfile $WINBINDPID -- $WINBINDD_OPTS
 
 		log_end_msg $?
 		;;
@@ -50,7 +50,7 @@ case "$1" in
 			exit 0
 		fi
 		log_daemon_msg "Stopping the Winbind daemon" "winbind"
-		start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
+		start-stop-daemon --stop --quiet --oknodo --exec $DAEMON --pidfile $WINBINDPID
 		log_end_msg $?
 		;;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git