diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 14:21:35 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 14:21:35 +0100 |
| commit | 7dfc7c709ffe09669e8c79661faea21451cca603 (patch) | |
| tree | 9e9367b2263734885ece3be9b7d68b8bab0a5926 /runtime | |
| parent | 409cd9496b08be6270c69e34374e94379ed0e4b9 (diff) | |
| parent | e6e1ff65bcb577df238c9c24d55909bca6febbb3 (diff) | |
| download | rsyslog-7dfc7c709ffe09669e8c79661faea21451cca603.tar.gz rsyslog-7dfc7c709ffe09669e8c79661faea21451cca603.tar.xz rsyslog-7dfc7c709ffe09669e8c79661faea21451cca603.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
doc/v6compatibility.html
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 fcb09bd5..d1ed3009 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -981,9 +981,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) |