diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-18 18:21:08 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-18 18:21:08 +0100 |
| commit | 9b24152b6ac6af942a62675c6136316fd487b661 (patch) | |
| tree | 2edccc0401771327943f5af04ee58b10c4f79aa8 /runtime/conf.c | |
| parent | c9b70abf1a7a40b5afc80975d016980dd4e63e36 (diff) | |
| download | rsyslog-9b24152b6ac6af942a62675c6136316fd487b661.tar.gz rsyslog-9b24152b6ac6af942a62675c6136316fd487b661.tar.xz rsyslog-9b24152b6ac6af942a62675c6136316fd487b661.zip | |
undoing v6.1 config scoping interface, part I
The most common files are now changed, more needs to be done.
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 53eae837..5118cdd9 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -1442,12 +1442,7 @@ BEGINAbstractObjClassInit(conf, 1, OBJ_IS_CORE_MODULE) /* class, version - CHANG /* 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)); + CHKiRet(regCfSysLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, NULL)); ENDObjClassInit(conf) /* vi:set ai: |