diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 12:14:55 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 12:14:55 +0200 |
| commit | d91e8c31a1e342eb15b0839b9e721730fcad0549 (patch) | |
| tree | 50f9e0778810a157289777511077f6277947cb91 | |
| parent | ee1afa2f3607ce6a1b278ce0a8d051aa040a362b (diff) | |
| download | rsyslog-d91e8c31a1e342eb15b0839b9e721730fcad0549.tar.gz rsyslog-d91e8c31a1e342eb15b0839b9e721730fcad0549.tar.xz rsyslog-d91e8c31a1e342eb15b0839b9e721730fcad0549.zip | |
bugfix: some config processing warning messages were treated as errors
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | grammar/rainerscript.c | 8 |
2 files changed, 7 insertions, 2 deletions
@@ -3,6 +3,7 @@ Version 7.1.10 [beta] 2012-10-11 - bugfix: m4 directory was not present in release tarball - bugfix: small memory leak with string-type templates - bugfix: small memory leak when template was specified in omfile + - bugfix: some config processing warning messages were treated as errors --------------------------------------------------------------------------- Version 7.1.9 [beta] 2012-10-09 - bugfix: comments inside objects (e.g. action()) were not properly handled diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index ad6a32e8..a98277af 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -2186,10 +2186,14 @@ cnfstmtNewAct(struct nvlst *lst) { struct cnfstmt* cnfstmt; char namebuf[256]; + rsRetVal localRet; if((cnfstmt = cnfstmtNew(S_ACT)) == NULL) goto done; - if(actionNewInst(lst, &cnfstmt->d.act) != RS_RET_OK) { - // TODO:RS_RET_WARN? + localRet = actionNewInst(lst, &cnfstmt->d.act); + if(localRet == RS_RET_OK_WARN) { + parser_errmsg("warnings occured in file '%s' around line %d", + cnfcurrfn, yylineno); + } else if(actionNewInst(lst, &cnfstmt->d.act) != RS_RET_OK) { parser_errmsg("errors occured in file '%s' around line %d", cnfcurrfn, yylineno); cnfstmt->nodetype = S_NOP; /* disable action! */ |