diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-19 13:07:46 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-19 13:07:46 +0100 |
| commit | 6624ad434b5e346a84f600845c09739208382f43 (patch) | |
| tree | 1b416935067cbc239499aa2850face4cad05dd7b /runtime/conf.c | |
| parent | 03be2fcd7cfe3355b8108fe8368a6a65ab98e9e9 (diff) | |
| parent | b38dd53e08258bc694f16373671be9c1c3deaa0c (diff) | |
| download | rsyslog-6624ad434b5e346a84f600845c09739208382f43.tar.gz rsyslog-6624ad434b5e346a84f600845c09739208382f43.tar.xz rsyslog-6624ad434b5e346a84f600845c09739208382f43.zip | |
Merge branch 'v6-stable-noscoping' into master
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imfile/imfile.c
plugins/imklog/imklog.c
plugins/immark/immark.c
plugins/imptcp/imptcp.c
plugins/imrelp/imrelp.c
plugins/imtcp/imtcp.c
plugins/imtemplate/imtemplate.c
plugins/imudp/imudp.c
plugins/imuxsock/imuxsock.c
plugins/mmsnmptrapd/mmsnmptrapd.c
plugins/omtemplate/omtemplate.c
runtime/glbl.c
runtime/parser.c
tools/omfile.c
tools/syslogd.c
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 94322f10..2e21f3cb 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -980,12 +980,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: |