[Pkg-net-snmp-commits] [pkg-net-snmp] 06/06: fix Bug#745828

[Hideki Yamane]

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

henrich pushed a commit to branch master
in repository pkg-net-snmp.

commit 31a01c73e89248118380a58a0cf8cf7b2ef41a83
Author: Hideki Yamane <henrich at debian.org>
Date:   Sat Apr 26 14:21:29 2014 +0900

    fix Bug#745828
---
 debian/changelog      | 8 ++++++++
 debian/snmpd.init     | 4 ++--
 debian/snmptrapd.init | 6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43ab866..1b71bb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+net-snmp (5.7.2.1~dfsg-4) unstable; urgency=medium
+
+  * debian/*.init
+    - fix incorrect sequence of options passed to start-stop-daemon
+      Thanks to Mehul Sanghvi <mehul.sanghvi at gmail.com> (Closes: #745828)
+
+ -- Hideki Yamane <henrich at debian.org>  Sat, 26 Apr 2014 14:19:55 +0900
+
 net-snmp (5.7.2.1~dfsg-3) unstable; urgency=medium
 
   * Upload to unstable
diff --git a/debian/snmpd.init b/debian/snmpd.init
index 8e93346..3e6dc03 100644
--- a/debian/snmpd.init
+++ b/debian/snmpd.init
@@ -52,12 +52,12 @@ case "$1" in
     ;;
   stop)
     log_daemon_msg "Stopping SNMP services:"
-    start-stop-daemon --quiet --stop --oknodo --exec --retry 3 /usr/sbin/snmpd && [ ! -f $SNMP_PID ] || rm $SNMP_PID
+    start-stop-daemon --quiet --stop --oknodo --retry 3 --exec /usr/sbin/snmpd && [ ! -f $SNMP_PID ] || rm $SNMP_PID
     log_progress_msg " snmpd"
     ;;
   restart)
     log_daemon_msg "Restarting SNMP services:"
-    start-stop-daemon --quiet --stop --oknodo --exec --retry 3 /usr/sbin/snmpd  && [ ! -f $SNMP_PID ] || rm $SNMP_PID
+    start-stop-daemon --quiet --stop --oknodo --retry 3 --exec /usr/sbin/snmpd  && [ ! -f $SNMP_PID ] || rm $SNMP_PID
     if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then
 	start-stop-daemon --quiet --start --exec /usr/sbin/snmpd -- $SNMPDOPTS
 	log_progress_msg " snmpd"
diff --git a/debian/snmptrapd.init b/debian/snmptrapd.init
index e70aee9..48e26ac 100644
--- a/debian/snmptrapd.init
+++ b/debian/snmptrapd.init
@@ -45,16 +45,16 @@ case "$1" in
     ;;
   stop)
     log_daemon_msg "Stopping SNMP trap services:"
-    start-stop-daemon --quiet --stop --oknodo --exec --retry 3 /usr/sbin/snmptrapd \
+    start-stop-daemon --quiet --stop --oknodo --retry 3 --exec /usr/sbin/snmptrapd \
            && [ ! -f $TRAPD_PID ] || rm $TRAPD_PID
     log_progress_msg " snmptrapd"
     ;;
   restart)
     log_daemon_msg "Restarting SNMP trap services:"
-    start-stop-daemon --quiet --stop --oknodo --exec --retry 3 /usr/sbin/snmptrapd \
+    start-stop-daemon --quiet --stop --oknodo --retry 3 --exec /usr/sbin/snmptrapd \
            && [ ! -f $TRAPD_PID ] || rm $TRAPD_PID
     if [ "$TRAPDRUN" = "yes" -a -f /etc/snmp/snmptrapd.conf ]; then
-        start-stop-daemon --quiet --start --exec --retry 3 /usr/sbin/snmptrapd -- $TRAPDOPTS
+        start-stop-daemon --quiet --start --retry 3 --exec /usr/sbin/snmptrapd -- $TRAPDOPTS
 	log_progress_msg " snmptrapd"
     fi
     ;;

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