diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-20 14:17:39 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-20 14:17:39 +0100 |
| commit | c0e58be06bf7c354c72f54c08be469d180ec6d99 (patch) | |
| tree | 86576e2fc91072206b76b69c2fbfdbe65ada56b3 /grammar | |
| parent | 0049a3b51bf8beb1b40e7ee6f95f4de4f040dfd8 (diff) | |
| parent | 2c3bce4e31608572b8d469237c086da6656afa8a (diff) | |
| download | rsyslog-c0e58be06bf7c354c72f54c08be469d180ec6d99.tar.gz rsyslog-c0e58be06bf7c354c72f54c08be469d180ec6d99.tar.bz2 rsyslog-c0e58be06bf7c354c72f54c08be469d180ec6d99.zip | |
Merge branch 'v7-devel'
Conflicts:
tests/Makefile.am
Diffstat (limited to 'grammar')
| -rw-r--r-- | grammar/rainerscript.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index cc44bd3f..427e1abb 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -2884,7 +2884,7 @@ cnfexprOptimize_CMP_severity_facility(struct cnfexpr *expr) if(expr->l->nodetype != 'V') FINALIZE; - if(!strcmp("$syslogseverity", ((struct cnfvar*)expr->l)->name)) { + if(!strcmp("syslogseverity", ((struct cnfvar*)expr->l)->name)) { if(expr->r->nodetype == 'N') { int sev = (int) ((struct cnfnumval*)expr->r)->val; if(sev >= 0 && sev <= 7) { @@ -2898,7 +2898,7 @@ cnfexprOptimize_CMP_severity_facility(struct cnfexpr *expr) "evaluate to FALSE", sev); } } - } else if(!strcmp("$syslogfacility", ((struct cnfvar*)expr->l)->name)) { + } else if(!strcmp("syslogfacility", ((struct cnfvar*)expr->l)->name)) { if(expr->r->nodetype == 'N') { int fac = (int) ((struct cnfnumval*)expr->r)->val; if(fac >= 0 && fac <= 24) { @@ -2926,7 +2926,7 @@ cnfexprOptimize_CMP_var(struct cnfexpr *expr) { struct cnffunc *func; - if(!strcmp("$syslogfacility-text", ((struct cnfvar*)expr->l)->name)) { + if(!strcmp("syslogfacility-text", ((struct cnfvar*)expr->l)->name)) { if(expr->r->nodetype == 'S') { char *cstr = es_str2cstr(((struct cnfstringval*)expr->r)->estr, NULL); int fac = decodeSyslogName((uchar*)cstr, syslogFacNames); @@ -2944,7 +2944,7 @@ cnfexprOptimize_CMP_var(struct cnfexpr *expr) } free(cstr); } - } else if(!strcmp("$syslogseverity-text", ((struct cnfvar*)expr->l)->name)) { + } else if(!strcmp("syslogseverity-text", ((struct cnfvar*)expr->l)->name)) { if(expr->r->nodetype == 'S') { char *cstr = es_str2cstr(((struct cnfstringval*)expr->r)->estr, NULL); int sev = decodeSyslogName((uchar*)cstr, syslogPriNames); |