nss-pam-ldapd commit: r2162 - debian/nss-pam-ldapd/branches/jessie/debian

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sun Jan 22 14:10:07 2017
New Revision: 2162
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=2162&view=revision

Log:
import 0.9.4-3+deb8u2

Modified:
   debian/nss-pam-ldapd/branches/jessie/debian/changelog
   debian/nss-pam-ldapd/branches/jessie/debian/nslcd.init

Modified: debian/nss-pam-ldapd/branches/jessie/debian/changelog
==============================================================================
--- debian/nss-pam-ldapd/branches/jessie/debian/changelog       Wed Jan 18 
23:20:25 2017        (r2161)
+++ debian/nss-pam-ldapd/branches/jessie/debian/changelog       Sun Jan 22 
14:10:07 2017        (r2162)
@@ -1,3 +1,11 @@
+nss-pam-ldapd (0.9.4-3+deb8u2) jessie; urgency=medium
+
+  * Non-maintainer upload.
+  * have init script stop action only return when nslcd has actually stopped
+    (Closes: #814881)
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Wed, 09 Nov 2016 13:48:14 +0100
+
 nss-pam-ldapd (0.9.4-3+deb8u1) stable; urgency=low
 
   * fix-issues-withdaemonising.patch, avoid-signal-race.patch: patches to

Modified: debian/nss-pam-ldapd/branches/jessie/debian/nslcd.init
==============================================================================
--- debian/nss-pam-ldapd/branches/jessie/debian/nslcd.init      Wed Jan 18 
23:20:25 2017        (r2161)
+++ debian/nss-pam-ldapd/branches/jessie/debian/nslcd.init      Sun Jan 22 
14:10:07 2017        (r2162)
@@ -96,7 +96,7 @@
   if [ "$K5START_START" = "yes" ]
   then
     log_daemon_msg "Stopping $K5START_DESC" "k5start"
-    start-stop-daemon --stop --oknodo --pidfile $K5START_PIDFILE
+    start-stop-daemon --stop --oknodo --retry 10 --pidfile $K5START_PIDFILE
     log_end_msg $?
     # remove any left behind files
     [ -n "$K5START_PIDFILE" ] && rm -f $K5START_PIDFILE
@@ -129,7 +129,7 @@
 stop)
   # stop nslcd
   log_daemon_msg "Stopping $NSLCD_DESC" "$NSLCD_NAME"
-  start-stop-daemon --stop --oknodo \
+  start-stop-daemon --stop --oknodo --retry 10 \
                     --pidfile $NSLCD_PIDFILE \
                     --name "$NSLCD_NAME"
   log_end_msg $?
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
https://lists.arthurdejong.org/nss-pam-ldapd-commits/