diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 17:41:28 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 17:41:28 +0200 |
| commit | d9f1bbf46e0e240dc8bdbaf6db74e499e668faa2 (patch) | |
| tree | 3950a942de498562f7e5446d806746ed25501e1b /tools | |
| parent | eafafc63597a600fceda5ac9ada90acd6e2f037e (diff) | |
| parent | 3e2be47ed69d2b4ce21777a75ad6128592e84d1d (diff) | |
| download | rsyslog-d9f1bbf46e0e240dc8bdbaf6db74e499e668faa2.tar.gz rsyslog-d9f1bbf46e0e240dc8bdbaf6db74e499e668faa2.tar.xz rsyslog-d9f1bbf46e0e240dc8bdbaf6db74e499e668faa2.zip | |
Merge branch 'beta'
Conflicts:
runtime/rsyslog.h
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 d925505f..b43b7a37 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2613,7 +2613,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 |