diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-27 18:23:19 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-27 18:23:19 +0100 |
| commit | 888d6e771f2ff6707dd3b8655b1bad4b4519b641 (patch) | |
| tree | 8a5924d99fe00900704c6e03376d04670a454a41 | |
| parent | 48f646c149eaabf27909be0fddb06945c162e4b2 (diff) | |
| parent | 396f5898c93d25905479e5b051745bb1a40fab50 (diff) | |
| download | rsyslog-888d6e771f2ff6707dd3b8655b1bad4b4519b641.tar.gz rsyslog-888d6e771f2ff6707dd3b8655b1bad4b4519b641.tar.bz2 rsyslog-888d6e771f2ff6707dd3b8655b1bad4b4519b641.zip | |
Merge branch 'c10' into v7-devel
Conflicts:
configure.ac
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | plugins/mmrfc5424addhmac/mmrfc5424addhmac.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -1,4 +1,7 @@ --------------------------------------------------------------------------- +Version 7.5.8 [v7-devel] 2013-11-?? +- bugfix: mmrfc5424addhmac: "key" parameter was not properly processed +--------------------------------------------------------------------------- Version 7.5.7 [v7-devel] 2013-11-25 - queue defaults have changed * high water mark is now dynamically 90% of queue size 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")) { |