diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 17:39:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 17:39:32 +0200 |
| commit | 2cf3b2fa3c5c5b6cbf104294c7fc8860bb49bac0 (patch) | |
| tree | 338446e4e2caf5ae46b8aed14faea970f01aa999 /tools | |
| parent | 6ddb3249e6bac6c573a5ab45eba65fba91c1d9e9 (diff) | |
| download | rsyslog-2cf3b2fa3c5c5b6cbf104294c7fc8860bb49bac0.tar.gz rsyslog-2cf3b2fa3c5c5b6cbf104294c7fc8860bb49bac0.tar.xz rsyslog-2cf3b2fa3c5c5b6cbf104294c7fc8860bb49bac0.zip | |
fixed a regression of yesterday's patch
... I know I should not have done this to a stable branch... Thankfully
nothing was yet released.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syslogd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 13eaede2..357f6699 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2300,7 +2300,7 @@ init(void) bHadConfigErr = 1; } - if(localRet != RS_RET_OK || iNbrActions == 0) { + if((localRet != RS_RET_OK && localRet != RS_RET_NONFATAL_CONFIG_ERR) || iNbrActions == 0) { /* rgerhards: this code is executed to set defaults when the * config file could not be opened. We might think about * abandoning the run in this case - but this, too, is not |