diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 17:40:48 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 17:40:48 +0200 |
commit | 3e2be47ed69d2b4ce21777a75ad6128592e84d1d (patch) | |
tree | 85efb0765fdd3c2143552e14037471422b759d66 /runtime/conf.c | |
parent | 02929c7bbf1189a4fc96e42fb127f2f04a279719 (diff) | |
parent | 2cf3b2fa3c5c5b6cbf104294c7fc8860bb49bac0 (diff) | |
download | rsyslog-3e2be47ed69d2b4ce21777a75ad6128592e84d1d.tar.gz rsyslog-3e2be47ed69d2b4ce21777a75ad6128592e84d1d.tar.xz rsyslog-3e2be47ed69d2b4ce21777a75ad6128592e84d1d.zip |
Merge branch 'v3-stable' into beta
Conflicts:
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 37716f88..55eb9800 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; } |