diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-27 17:09:54 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-27 17:09:54 +0200 |
| commit | a74898dc827ed4a8f9587196716746031b1e5169 (patch) | |
| tree | fe6cc689c047b6fda7cad92dd8ff9a170af92873 /runtime/rsconf.c | |
| parent | d1589cd43978c700e2c88747e04d29c64a25d185 (diff) | |
| parent | 3d56820f130e6c1b674560125e677be3b6a2d8f4 (diff) | |
| download | rsyslog-a74898dc827ed4a8f9587196716746031b1e5169.tar.gz rsyslog-a74898dc827ed4a8f9587196716746031b1e5169.tar.xz rsyslog-a74898dc827ed4a8f9587196716746031b1e5169.zip | |
Merge branch 'master-newtemplate'
Conflicts:
runtime/msg.c
Diffstat (limited to 'runtime/rsconf.c')
| -rw-r--r-- | runtime/rsconf.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/runtime/rsconf.c b/runtime/rsconf.c index bd002353..5d2407ec 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -66,6 +66,7 @@ #include "parserif.h" #include "modules.h" #include "dirty.h" +#include "template.h" /* static data */ DEFobjStaticHelpers @@ -386,6 +387,8 @@ yyerror(char *s) } void cnfDoObj(struct cnfobj *o) { + int bChkUnuse = 1; + dbgprintf("cnf:global:obj: "); cnfobjPrint(o); switch(o->objType) { @@ -398,8 +401,17 @@ void cnfDoObj(struct cnfobj *o) case CNFOBJ_ACTION: actionProcessCnf(o); break; + case CNFOBJ_TPL: + tplProcessCnf(o); + break; + case CNFOBJ_PROPERTY: + case CNFOBJ_CONSTANT: + /* these types are processed at a later stage */ + bChkUnuse = 0; + break; } - nvlstChkUnused(o->nvlst); + if(bChkUnuse) + nvlstChkUnused(o->nvlst); cnfobjDestruct(o); } |