diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-19 10:45:53 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-19 10:45:53 +0100 |
| commit | cc9db052a7f5ac7e8c4d07f63f8c4545e1b01882 (patch) | |
| tree | 84cbfa3454580f9e2d07818456a9b0e7ea2cf7d2 /grammar | |
| parent | 88e6919d9db48c54b532698a8351c93356d11307 (diff) | |
| parent | de652e16a83e8e53f63b81caa0bcc0d7fbc04263 (diff) | |
| download | rsyslog-cc9db052a7f5ac7e8c4d07f63f8c4545e1b01882.tar.gz rsyslog-cc9db052a7f5ac7e8c4d07f63f8c4545e1b01882.tar.bz2 rsyslog-cc9db052a7f5ac7e8c4d07f63f8c4545e1b01882.zip | |
Merge branch 'v7-stable' into v7-devel
Conflicts:
ChangeLog
plugins/imuxsock/imuxsock.c
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 0dad86cc..ecc23b54 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; } |