diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-27 18:24:15 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-27 18:24:15 +0100 |
| commit | 323cf455285f7c9e6fda9b70af31fd21aa7c61e4 (patch) | |
| tree | 848829a8c8d7154509e886d1e75081528c80b9d9 | |
| parent | 55834d95c993596c10d21515c12e2676d8606ef5 (diff) | |
| parent | 888d6e771f2ff6707dd3b8655b1bad4b4519b641 (diff) | |
| download | rsyslog-323cf455285f7c9e6fda9b70af31fd21aa7c61e4.tar.gz rsyslog-323cf455285f7c9e6fda9b70af31fd21aa7c61e4.tar.bz2 rsyslog-323cf455285f7c9e6fda9b70af31fd21aa7c61e4.zip | |
Merge branch 'v7-devel'
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | plugins/mmrfc5424addhmac/mmrfc5424addhmac.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -13,6 +13,7 @@ Version 8.1.2 [devel] 2013-11-?? if the $WorkDirectory was changed multiple times, all queues only used the last value set. - bugfix: legacy directive $ActionQueueWorkerThreads was not honored +- bugfix: mmrfc5424addhmac: "key" parameter was not properly processed --------------------------------------------------------------------------- Version 8.1.1 [devel] 2013-11-19 - bugfix: STOP/discard(~) was mostly NOT honored @@ -54,6 +55,9 @@ Version 8.1.0 [devel] 2013-11-15 statement. Also, it can still be build without problems, the option must just explicitely be given. --------------------------------------------------------------------------- +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")) { |