summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-27 18:21:44 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-27 18:21:44 +0100
commit396f5898c93d25905479e5b051745bb1a40fab50 (patch)
tree10982340f1a5addcf97f518107587c652433d239
parent5fd3d8e59334fac9bb21062d66d83fce511c8af9 (diff)
downloadrsyslog-396f5898c93d25905479e5b051745bb1a40fab50.tar.gz
rsyslog-396f5898c93d25905479e5b051745bb1a40fab50.tar.bz2
rsyslog-396f5898c93d25905479e5b051745bb1a40fab50.zip
bugfix: mmrfc5424addhmac: "key" parameter was not properly processed
-rw-r--r--ChangeLog1
-rw-r--r--configure.ac2
-rw-r--r--plugins/mmrfc5424addhmac/mmrfc5424addhmac.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ca544fff..21ce4db3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+- bugfix: mmrfc5424addhmac: "key" parameter was not properly processed
---------------------------------------------------------------------------
Version 7.4.5 [v7.4-stable] 2013-09-??
- bugfix: doc: imuxsock legacy param $SystemLogSocketParseTrusted was
diff --git a/configure.ac b/configure.ac
index 4263d8e5..041b936c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([rsyslog],[7.4.4.c10.1],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[7.4.4.c10.2],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/plugins/mmrfc5424addhmac/mmrfc5424addhmac.c b/plugins/mmrfc5424addhmac/mmrfc5424addhmac.c
index a7aea9b4..959a8bad 100644
--- a/plugins/mmrfc5424addhmac/mmrfc5424addhmac.c
+++ b/plugins/mmrfc5424addhmac/mmrfc5424addhmac.c
@@ -163,7 +163,7 @@ CODESTARTnewActInst
for(i = 0 ; i < actpblk.nParams ; ++i) {
if(!pvals[i].bUsed)
continue;
- if(!strcmp(actpblk.descr[i].name, "replacementchar")) {
+ if(!strcmp(actpblk.descr[i].name, "key")) {
pData->key = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
pData->keylen = es_strlen(pvals[i].val.d.estr);
} else if(!strcmp(actpblk.descr[i].name, "hashfunction")) {