diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-20 12:15:52 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-20 12:15:52 +0100 |
| commit | 4658846f9585027385ffbbd772ed004a34c34e28 (patch) | |
| tree | 5a68bc9fe7dab99875c107cb8ed60d4b7b13c5f8 | |
| parent | 2e4e7e819fed64fa2897af01479a9083b081d0c2 (diff) | |
| parent | 5b76d639659fe5582b425b903fa8f5e14624a8e4 (diff) | |
| download | rsyslog-4658846f9585027385ffbbd772ed004a34c34e28.tar.gz rsyslog-4658846f9585027385ffbbd772ed004a34c34e28.tar.bz2 rsyslog-4658846f9585027385ffbbd772ed004a34c34e28.zip | |
Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stable
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | plugins/mmnormalize/mmnormalize.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -13,6 +13,9 @@ Version 7.2.7 [v7-stable] 2013-03-?? - bugfix: using group resolution could lead to endless loop Thanks to Tomas Heinrich for the patch. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=310 +- bugfix: $mmnormalizeuseramsg paramter was specified with wrong type + Thank to Renzhong Zhang for alerting us of the problem. + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=420 - bugfix: RainerScript getenv() function caused segfault when var was not found. Thanks to Philippe Muller for the patch. diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c index d3fba39b..c366d5fe 100644 --- a/plugins/mmnormalize/mmnormalize.c +++ b/plugins/mmnormalize/mmnormalize.c @@ -281,7 +281,7 @@ CODEmodInit_QueryRegCFSLineHdlr CHKiRet(omsdRegCFSLineHdlr((uchar *)"mmnormalizerulebase", 0, eCmdHdlrGetWord, setRuleBase, NULL, STD_LOADABLE_MODULE_ID)); - CHKiRet(omsdRegCFSLineHdlr((uchar *)"mmnormalizeuserawmsg", 0, eCmdHdlrInt, + CHKiRet(omsdRegCFSLineHdlr((uchar *)"mmnormalizeuserawmsg", 0, eCmdHdlrBinary, NULL, &cs.bUseRawMsg, STD_LOADABLE_MODULE_ID)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID)); |