diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-18 13:57:42 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-18 13:57:42 +0100 |
| commit | 0dab9aa0c4f50403436f318e92a65903a956c195 (patch) | |
| tree | 55972a76acfced9560cd9064da7c0bc594b134c3 /tools/syslogd.c | |
| parent | dac7e3d39b7d2dfe5c3fddf38275b2ca49d5396e (diff) | |
| download | rsyslog-0dab9aa0c4f50403436f318e92a65903a956c195.tar.gz rsyslog-0dab9aa0c4f50403436f318e92a65903a956c195.tar.bz2 rsyslog-0dab9aa0c4f50403436f318e92a65903a956c195.zip | |
fix merge problemv7.3.8
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 66adde48..d4fc1c36 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2001,16 +2001,16 @@ int realMain(int argc, char **argv) if(!iConfigVerify) CHKiRet(doGlblProcessInit()); + /* Send a signal to the parent so it can terminate. */ + if(glblGetOurPid() != ppid) + kill(ppid, SIGTERM); + CHKiRet(init()); if(Debug && debugging_on) { dbgprintf("Debugging enabled, SIGUSR1 to turn off debugging.\n"); } - /* Send a signal to the parent so it can terminate. */ - if(glblGetOurPid() != ppid) - kill(ppid, SIGTERM); - /* END OF INTIALIZATION */ DBGPRINTF("initialization completed, transitioning to regular run mode\n"); |