diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-04 03:27:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-04 03:27:41 +0200 |
| commit | 92d10abc1b66907f84b82d2d34552a90b852aa5f (patch) | |
| tree | 8a90476f1ab39e133ff741ea2ad18010335b2b87 /tools/syslogd.c | |
| parent | b22990c6d359ffdedbf266672b8c875964b81d64 (diff) | |
| parent | 4f742a8e32c43dc9b514ceaf80f4d17e697dfdf6 (diff) | |
| download | rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.tar.gz rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.tar.bz2 rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.zip | |
Merge branch 'master' into v5-devel
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'tools/syslogd.c')
| -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 47fa2f58..3d91e22f 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2626,7 +2626,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 |