lsb 3.2-3 Debian release.

diff --git a/debian/changelog b/debian/changelog
index 9779110719739bb68151b562dbbccd670149cd84..1422cd33bdb56c40a851dc4c7afa883e12200249 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lsb (3.2-3) unstable; urgency=medium
+
+  * Handle missing $sig in killproc() properly.  (Closes: #469167)
+
+ -- Chris Lawrence <lawrencc@debian.org>  Mon, 03 Mar 2008 09:01:07 -0600
+
 lsb (3.2-2) unstable; urgency=low
 
   * lsb_release -v now detects the lsb-qt4 version(s) installed correctly.

diff --git a/init-functions b/init-functions
index beb44f697750e638e77627e75e622b88cc41da82..1b2d56f80b3d59029c9f158690cec4cb510dc366 100644 (file)
--- a/init-functions
+++ b/init-functions
@@ -119,7 +119,11 @@ killproc () {
     [ -n "$sig" -o "$sig" = 15 -o "$sig" = TERM ] && is_term_sig=yes
     status=0
     if [ ! "$is_term_sig" = yes ]; then
-        /sbin/start-stop-daemon --stop --pidfile "$pidfile" --signal "$sig" --quiet $name_param || status="$?"
+        if [ -n "$sig" ]; then
+            /sbin/start-stop-daemon --stop --pidfile "$pidfile" --quiet $name_param || status="$?"
+        else
+            /sbin/start-stop-daemon --stop --signal "$sig" --pidfile "$pidfile" --quiet $name_param || status="$?"
+        fi
     else
         /sbin/start-stop-daemon --stop --pidfile "$pidfile" --retry 5 --quiet --oknodo $name_param || status="$?"
     fi