diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 14:17:40 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 14:17:40 +0100 |
| commit | e6e1ff65bcb577df238c9c24d55909bca6febbb3 (patch) | |
| tree | 2dde17927af06c2763364baedc35be409a2e9393 /runtime | |
| parent | 4f0ff38f1cd0518e2b0dfdeffaef3373c9bd4f47 (diff) | |
| download | rsyslog-e6e1ff65bcb577df238c9c24d55909bca6febbb3.tar.gz rsyslog-e6e1ff65bcb577df238c9c24d55909bca6febbb3.tar.bz2 rsyslog-e6e1ff65bcb577df238c9c24d55909bca6febbb3.zip | |
removing $Begin, $End, $StrictScoping directives
v6.4 will provide the same functionality in a far better way.
So we do not want to clutter the code.
-------------------------
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/conf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index b324e125..af9d7be7 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -1443,9 +1443,14 @@ BEGINAbstractObjClassInit(conf, 1, OBJ_IS_CORE_MODULE) /* class, version - CHANG CHKiRet(objUse(rule, CORE_COMPONENT)); CHKiRet(objUse(ruleset, CORE_COMPONENT)); + /* These commands will NOT be supported -- the new v6.3 config system provides + * far better methods. We will remove the related code soon. -- rgerhards, 2012-01-09 + */ +#if 0 CHKiRet(regCfSysLineHdlr((uchar *)"begin", 0, eCmdHdlrGetWord, beginConfObj, NULL, NULL, eConfObjGlobal)); CHKiRet(regCfSysLineHdlr((uchar *)"end", 0, eCmdHdlrGetWord, endConfObj, NULL, NULL, eConfObjAlways)); CHKiRet(regCfSysLineHdlr((uchar *)"strictscoping", 0, eCmdHdlrBinary, NULL, &bConfStrictScoping, NULL, eConfObjGlobal)); +#endif CHKiRet(regCfSysLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, NULL, eConfObjAction)); ENDObjClassInit(conf) |