Merge ~paelzer/ubuntu/+source/samba:lp-1792400-avoid-container-pid-confusion-trusty into ubuntu/+source/samba:ubuntu/trusty-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Xenial SRU completed and did not trigger any unexpected hiccup after a few days.
Lets also fix up trusty.

Autopkg Tests will be scheduled https://bileto.ubuntu.com/#/ticket/3481
PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3481

[Christian Ehrhardt  (paelzer)]

FYI: The Bug has an SRU Template with test instructions

[Andreas Hasenack (ahasenack)]

Verified it's the same change as done in xenial, and the samba version is the same too (4.3.11).

+1

review: Approve

[Andreas Hasenack (ahasenack)]

Bileto only shows the usual gvfs failure. Still a +1.

[Christian Ehrhardt  (paelzer)]

Autopkgtests are all good.
gvfs on ppc is the only outlier but it is a known bad-case and has an override:
vorlon:21:force-badtest gvfs/1.20.3-0ubuntu1.2

[Christian Ehrhardt  (paelzer)]

https://bileto.ubuntu.com/excuses/3481/trusty.html

[Christian Ehrhardt  (paelzer)]

Tag pushed and uploaded to Trusty-unapproved

diff --git a/debian/changelog b/debian/changelog
index af969c6..73d899c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+samba (2:4.3.11+dfsg-0ubuntu0.14.04.18) trusty; urgency=medium
+
+  * d/samba.nmbd.init, d/samba.samba-ad-dc.init, d/samba.smbd.init,
+    d/winbind.init avoid issues due to init scripts misdetecting
+    services (LP: #1792400)
+    - use --pidfile on --start to not block on same binaries running in
+      containers
+    - use --exec on --stop to not cause unintended processes to be acted on,
+      if the old process terminated without being able to remove the pid-file.
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 16 Oct 2018 09:55:34 +0200
+
 samba (2:4.3.11+dfsg-0ubuntu0.14.04.17) trusty; urgency=medium
 
   * d/p/bug_1583324_include_with_macro.patch: don't fail parsing the
diff --git a/debian/samba.nmbd.init b/debian/samba.nmbd.init
index 97a89d4..df78f28 100644
--- a/debian/samba.nmbd.init
+++ b/debian/samba.nmbd.init
@@ -41,7 +41,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
@@ -57,7 +57,7 @@ case $1 in
 
 		log_daemon_msg "Stopping NetBIOS name server" nmbd
 
-		start-stop-daemon --stop --quiet --pidfile $NMBDPID
+		start-stop-daemon --stop --quiet --exec /usr/sbin/nmbd --pidfile $NMBDPID
 		# Wait a little and remove stale PID file
 		sleep 1
 		if [ -f $NMBDPID ] && ! ps h `cat $NMBDPID` > /dev/null
diff --git a/debian/samba.samba-ad-dc.init b/debian/samba.samba-ad-dc.init
index 3132d2e..7c92c4b 100644
--- a/debian/samba.samba-ad-dc.init
+++ b/debian/samba.samba-ad-dc.init
@@ -54,7 +54,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
@@ -67,7 +67,7 @@ case "$1" in
 		fi
 		log_daemon_msg "Stopping Samba AD DC daemon" "samba"
 
-		start-stop-daemon --stop --quiet --pidfile $SAMBAPID
+		start-stop-daemon --stop --quiet --exec /usr/sbin/samba --pidfile $SAMBAPID
 		# Wait a little and remove stale PID file
 		sleep 1
 		if [ -f $SAMBAPID ] && ! ps h `cat $SAMBAPID` > /dev/null
diff --git a/debian/samba.smbd.init b/debian/samba.smbd.init
index 3db327e..93e8d13 100644
--- a/debian/samba.smbd.init
+++ b/debian/samba.smbd.init
@@ -37,7 +37,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
@@ -51,7 +51,7 @@ case $1 in
 
 		log_daemon_msg "Stopping SMB/CIFS daemon" smbd
 
-		start-stop-daemon --stop --quiet --pidfile $SMBDPID
+		start-stop-daemon --stop --quiet --exec /usr/sbin/smbd --pidfile $SMBDPID
 		# Wait a little and remove stale PID file
 		sleep 1
 		if [ -f $SMBDPID ] && ! ps h `cat $SMBDPID` > /dev/null
diff --git a/debian/winbind.init b/debian/winbind.init
index 6c0ec05..d8333f4 100644
--- a/debian/winbind.init
+++ b/debian/winbind.init
@@ -42,7 +42,7 @@ case "$1" in
 		mkdir -p /var/run/samba/winbindd_privileged || return 1
 		chgrp winbindd_priv $PIDDIR/winbindd_privileged/ || return 1
 		chmod 0750 $PIDDIR/winbindd_privileged/ || return 1
-		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 $?
 		;;
@@ -52,7 +52,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 $?
 		;;