diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-27 14:50:06 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-27 14:50:06 +0200 |
commit | fac3c09f0433ebe073e2572fe1eb0da5e598b7a6 (patch) | |
tree | 1d9335fe58ff6d3d1543f8a375f0cccd203ec91a /runtime/rsconf.c | |
parent | 205114176d08cf662faca67077598061404f0d24 (diff) | |
parent | 0d762b750988d47cfec96ee6e3bdca9ea15ecc96 (diff) | |
download | rsyslog-fac3c09f0433ebe073e2572fe1eb0da5e598b7a6.tar.gz rsyslog-fac3c09f0433ebe073e2572fe1eb0da5e598b7a6.tar.bz2 rsyslog-fac3c09f0433ebe073e2572fe1eb0da5e598b7a6.zip |
Merge branch 'v7-stable'
Diffstat (limited to 'runtime/rsconf.c')
-rw-r--r-- | runtime/rsconf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/rsconf.c b/runtime/rsconf.c index ad588832..dcaa1ad9 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -67,6 +67,7 @@ #include "dirty.h" #include "template.h" +extern char* yytext; /* static data */ DEFobjStaticHelpers DEFobjCurrIf(ruleset) @@ -390,7 +391,7 @@ parser_errmsg(char *fmt, ...) int yyerror(char *s) { - parser_errmsg("%s", s); + parser_errmsg("%s on token '%s'", s, yytext); return 0; } void cnfDoObj(struct cnfobj *o) |