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 /runtime/conf.c | |
| parent | b22990c6d359ffdedbf266672b8c875964b81d64 (diff) | |
| parent | 4f742a8e32c43dc9b514ceaf80f4d17e697dfdf6 (diff) | |
| download | rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.tar.gz rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.tar.xz rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.zip | |
Merge branch 'master' into v5-devel
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 1691e23a..0d0a8bd3 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -484,7 +484,7 @@ finalize_it: } if(bHadAnError && (iRet == RS_RET_OK)) { /* a bit dirty, enhance in future releases */ - iRet = RS_RET_ERR; + iRet = RS_RET_NONFATAL_CONFIG_ERR; } RETiRet; } |