If in --test mode, and --stop is given, increment n_killed, so that

start-stop-daemon returns the proper exit value.  Thanks Thomas Morin
<thomas.morin@enst-bretagne.fr>.

diff --git a/ChangeLog b/ChangeLog
index b1230ca72024ed13d5fb03e951ba7eac1c11d89a..49f6928316e25f4c0c03c871babb2504ce989fd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 11 22:26:30 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * utils/start-stop-daemon.c: If in --test mode, and --stop is given,
+    increment n_killed, so that start-stop-daemon returns the proper exit
+    value.  Thanks Thomas Morin <thomas.morin@enst-bretagne.fr>.
+
 Thu Jul 11 22:19:12 CDT 2002 Adam Heath <doogie@debian.org>
 
   * utils/start-stop-daemon.c: Fix test inversion in start-stop-daemon,

diff --git a/debian/changelog b/debian/changelog
index d31340e3daca604eae1100cfa47ef6eafff1706e..a987f60e796a6af30b901993164c8fc94bcb6b77 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ dpkg (1.10.3) unstable; urgency=low
   * Fix test inversion in start-stop-daemon, when checking the pid given in
     a pid file.  Thanks Thomas Morin <thomas.morin@enst-bretagne.fr>.
     Closes: #152270.
+  * If in --test mode, and --stop is given, increment n_killed, so that
+    start-stop-daemon returns the proper exit value.  Thanks Thomas Morin
+    <thomas.morin@enst-bretagne.fr>.  Closes: #151992.
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 654ab76a4c0cacbfa30daacea641ba132b96b6fe..9275463ab7104792ba543a2fb65e962d39e5b7fe 100644 (file)
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -941,10 +941,11 @@ do_stop(int signal_nr, int quietmode, int *n_killed, int *n_notkilled, int retry
        clear(&killed);
 
        for (p = found; p; p = p->next) {
-               if (testmode)
+               if (testmode) {
                        printf("Would send signal %d to %d.\n",
                               signal_nr, p->pid);
-               else if (kill(p->pid, signal_nr) == 0) {
+                       (*n_killed)++;
+               } else if (kill(p->pid, signal_nr) == 0) {
                        push(&killed, p->pid);
                        (*n_killed)++;
                } else {