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 /plugins/omprog | |
| 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 'plugins/omprog')
| -rw-r--r-- | plugins/omprog/omprog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/omprog/omprog.c b/plugins/omprog/omprog.c index fdd1a0c3..9b2ad934 100644 --- a/plugins/omprog/omprog.c +++ b/plugins/omprog/omprog.c @@ -353,8 +353,8 @@ SCOPINGmodInit *ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */ CODEmodInit_QueryRegCFSLineHdlr CHKiRet(objUse(errmsg, CORE_COMPONENT)); - CHKiRet(omsdRegCFSLineHdlr((uchar *)"actionomprogbinary", 0, eCmdHdlrGetWord, NULL, &cs.szBinary, STD_LOADABLE_MODULE_ID, eConfObjAction)); - CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID, eConfObjAction)); + CHKiRet(omsdRegCFSLineHdlr((uchar *)"actionomprogbinary", 0, eCmdHdlrGetWord, NULL, &cs.szBinary, STD_LOADABLE_MODULE_ID)); + CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID)); CODEmodInit_QueryRegCFSLineHdlr ENDmodInit |