aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2013-10-05 17:19:06 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2013-10-06 12:00:37 -0500
commit82378bd92dc5569c1c06f291b6f3c048044baafa (patch)
tree1f87a7e9cf81918a2fe9854bfa727e6af7232bd7 /src
parente6df76a3775f90f1178db507b6da08a02a9455f4 (diff)
start-stop-daemon: fix do_stop calls
Several calls to do_stop were forcing the test parameter to be true, which was causing extra output to the terminal, such as: * Would send signal 0 to pid xxxxx This should only happen if the --test command line option was used.
Diffstat (limited to 'src')
-rw-r--r--src/rc/start-stop-daemon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
index cceb0410..cc47c0b2 100644
--- a/src/rc/start-stop-daemon.c
+++ b/src/rc/start-stop-daemon.c
@@ -452,7 +452,7 @@ run_stop_schedule(const char *exec, const char *const *argv,
nloops++)
{
if ((nrunning = do_stop(exec, argv,
- pid, uid, 0, true)) == 0)
+ pid, uid, 0, test)) == 0)
return 0;
@@ -1075,7 +1075,7 @@ start_stop_daemon(int argc, char **argv)
pid = 0;
if (do_stop(exec, (const char * const *)margv, pid, uid,
- 0, true) > 0)
+ 0, test) > 0)
eerrorx("%s: %s is already running", applet, exec);
if (test) {
@@ -1352,7 +1352,7 @@ start_stop_daemon(int argc, char **argv)
} else
pid = 0;
if (do_stop(exec, (const char *const *)margv,
- pid, uid, 0, true) > 0)
+ pid, uid, 0, test) > 0)
alive = true;
}