diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-02-01 17:35:03 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-02-01 17:35:03 +0100 |
| commit | ce8e072564da6c3ef16755d8c3df8614895a717e (patch) | |
| tree | 3eda2559282bad07cb68ce6ebc4445ac40af820e | |
| parent | eda1278ece0ea1e5615a9f4d74f029b85eb35fb9 (diff) | |
| download | rsyslog-ce8e072564da6c3ef16755d8c3df8614895a717e.tar.gz rsyslog-ce8e072564da6c3ef16755d8c3df8614895a717e.tar.xz rsyslog-ce8e072564da6c3ef16755d8c3df8614895a717e.zip | |
conf file: bufgix: legacy parsing of some filters did not work correctly
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | grammar/lexer.l | 2 | ||||
| -rw-r--r-- | grammar/rainerscript.c | 1 | ||||
| -rw-r--r-- | runtime/conf.c | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -2,9 +2,6 @@ Version 6.3.7 [DEVEL] 2012-02-01 - imported refactored v5.9.6 imklog linux driver, now combined with BSD driver -- bugfix: rsyslog aborted during startup if there is an error in loading - an action and legacy configuration mode is used -- bugfix: bsd klog driver did no longer compile - removed imtemplate/omtemplate template modules, as this was waste of time The actual input/output modules are better copy templates. Instead, the now-removed modules cost time for maintenance AND often caused confusion @@ -18,6 +15,10 @@ Version 6.3.7 [DEVEL] 2012-02-01 - bugfix: potential abort after reading invalid X.509 certificate closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Thanks to Tomas Heinrich for the patch +- bufgix: legacy parsing of some filters did not work correctly +- bugfix: rsyslog aborted during startup if there is an error in loading + an action and legacy configuration mode is used +- bugfix: bsd klog driver did no longer compile - relicensed larger parts of the code under Apache (ASL) 2.0 --------------------------------------------------------------------------- Version 6.3.6 [DEVEL] 2011-09-19 diff --git a/grammar/lexer.l b/grammar/lexer.l index a3f8bedd..e688ffce 100644 --- a/grammar/lexer.l +++ b/grammar/lexer.l @@ -166,7 +166,7 @@ int fileno(FILE *stream); :[a-z0-9]+:[^\n]* | [\|\.\-\@\^?~>][^\n]+ | [a-z0-9_][a-z0-9_\-\+,;]* { yylval.s = strdup(yytext); - // printf("lex: LEGA ACT: '%s'\n", yytext); + dbgprintf("lex: LEGA ACT: '%s'\n", yytext); return LEGACY_ACTION; } <INOBJ>")" { BEGIN INITIAL; return ENDOBJ; } <INOBJ>[a-z][a-z0-9_\.]* { yylval.estr = es_newStrFromCStr(yytext, yyleng); diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index 22a90cb7..d1d64e6e 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -292,7 +292,6 @@ doGetQueueType(struct nvlst *valnode, struct cnfparamdescr *param, param->name, cstr); free(cstr); } -dbgprintf("XXXXX: queue type: %d\n", (int)val->val.d.n); val->val.datatype = 'N'; } diff --git a/runtime/conf.c b/runtime/conf.c index 37774902..7f6ad61a 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -596,7 +596,7 @@ rsRetVal cflineProcessPropFilter(uchar **pline, register rule_t *f) } /* skip to action part */ - if((iRet = parsSkipWhitespace(pPars, 1)) != RS_RET_OK) { + if((iRet = parsSkipWhitespace(pPars, 0)) != RS_RET_OK) { errmsg.LogError(0, iRet, "error %d skipping to action part - ignoring selector", iRet); rsParsDestruct(pPars); return(iRet); |