diff options
Diffstat (limited to 'src/progman.c')
| -rw-r--r-- | src/progman.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/progman.c b/src/progman.c index 5e8d331..854c81a 100644 --- a/src/progman.c +++ b/src/progman.c @@ -1147,6 +1147,7 @@ prog_start (struct prog *prog) /* The child branch. */ case 0: signal_setup (SIG_DFL); + setsid (); prog_start_prologue (prog); switch (prog->v.p.comp->mode) { @@ -1671,6 +1672,8 @@ check_stopping (struct prog *prog, time_t now) logmsg (LOG_EMERG, _("INTERNAL ERROR: attempting to kill unexisting process %s"), prog->tag); + else if (prog->v.p.comp->flags & CF_SIGGROUP) + kill (-prog->pid, SIGKILL); else kill (prog->pid, SIGKILL); } @@ -1826,7 +1829,10 @@ prog_stop (struct prog *prog, int sig) } } debug (1, ("stopping %s (%lu)", prog->tag, (unsigned long) prog->pid)); - kill (prog->pid, sig); + if (prog->v.p.comp->flags & CF_SIGGROUP) + kill (-prog->pid, sig); + else + kill (prog->pid, sig); } static void @@ -2040,7 +2046,7 @@ send_msg (char *rcpts, const char *msg_text) /* Child process */ /* ============= */ signal_setup (SIG_DFL); - + setsid (); if (pipe (p)) { logmsg (LOG_ERR, _("cannot send mail: pipe failed: %s"), @@ -2182,6 +2188,7 @@ run_command (struct action *act, struct prog *prog, unsigned retcode, { debug (1, (_("executing %s"), act->command)); /* Child */ + setsid (); setenv ("PIES_VERSION", PACKAGE_VERSION, 1); setenv ("PIES_COMPONENT", prog->tag, 1); setenv ("PIES_PID", umaxtostr (child_pid, buf), 1); @@ -2293,10 +2300,13 @@ progman_cleanup (int expect_term) struct prog *listener = prog->v.p.listener; listener->v.p.num_instances--; - prog->v.p.cclass->count--; - if (debug_level > 1) - conn_class_report (prog->v.p.cclass); - + if (prog->v.p.cclass) + { + prog->v.p.cclass->count--; + if (debug_level > 1) + conn_class_report (prog->v.p.cclass); + } + prog_stop_redirectors (prog); destroy_prog (&prog); react (listener, status, pid); |