diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-19 11:43:51 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-19 11:43:51 +0100 |
| commit | 86f233164f83fdccc54021dd4e81ef5a4a22c9e8 (patch) | |
| tree | c67083359f75b6fb22d88298a8565a7963105c69 /grammar | |
| parent | 75d2503bb71905f0c37d5228afa26b43bcb575f0 (diff) | |
| parent | 496fad48bc87e2064fb9154d89c12bdf6eb67cbb (diff) | |
| download | rsyslog-86f233164f83fdccc54021dd4e81ef5a4a22c9e8.tar.gz rsyslog-86f233164f83fdccc54021dd4e81ef5a4a22c9e8.tar.bz2 rsyslog-86f233164f83fdccc54021dd4e81ef5a4a22c9e8.zip | |
Merge branch 'v7-devel'
Conflicts:
ChangeLog
Diffstat (limited to 'grammar')
| -rw-r--r-- | grammar/rainerscript.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index 0c695934..cc44bd3f 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -2881,6 +2881,9 @@ cnfexprOptimize_CMP_severity_facility(struct cnfexpr *expr) { struct cnffunc *func; + if(expr->l->nodetype != 'V') + FINALIZE; + if(!strcmp("$syslogseverity", ((struct cnfvar*)expr->l)->name)) { if(expr->r->nodetype == 'N') { int sev = (int) ((struct cnfnumval*)expr->r)->val; @@ -2910,6 +2913,7 @@ cnfexprOptimize_CMP_severity_facility(struct cnfexpr *expr) } } } +finalize_it: return expr; } |