diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 14:29:48 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 14:29:48 +0100 |
| commit | cb843f8b788644ea441e9f122468f442ef3d9a0b (patch) | |
| tree | 3c321d85762709769d7fa10db82d1f8ab6a81184 /runtime/conf.c | |
| parent | 1773bfa14b271d3bcd7fd96bba0bae8028280b75 (diff) | |
| download | rsyslog-cb843f8b788644ea441e9f122468f442ef3d9a0b.tar.gz rsyslog-cb843f8b788644ea441e9f122468f442ef3d9a0b.tar.xz rsyslog-cb843f8b788644ea441e9f122468f442ef3d9a0b.zip | |
bugfix: rsyslog aborted during startup if there is an error in loading an action
and legacy configuration mode is used
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 24f64b9f..37774902 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -736,9 +736,6 @@ rsRetVal cflineDoAction(rsconf_t *conf, uchar **p, action_t **ppAction) iRet = RS_RET_OK; } if(iRet == RS_RET_OK || iRet == RS_RET_SUSPENDED) { - /* advance our config parser state: we now only accept an $End as valid, - * no more action statments. - */ if((iRet = addAction(&pAction, pMod, pModData, pOMSR, NULL, NULL, (iRet == RS_RET_SUSPENDED)? 1 : 0)) == RS_RET_OK) { /* now check if the module is compatible with select features */ @@ -752,8 +749,7 @@ rsRetVal cflineDoAction(rsconf_t *conf, uchar **p, action_t **ppAction) conf->actions.nbrActions++; /* one more active action! */ } break; - } - else if(iRet != RS_RET_CONFLINE_UNPROCESSED) { + } else if(iRet != RS_RET_CONFLINE_UNPROCESSED) { /* In this case, the module would have handled the config * line, but some error occured while doing so. This error should * already by reported by the module. We do not try any other |