summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-09-02 15:12:16 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-09-02 15:12:16 +0200
commit99e21ffa873e2ee3e12640f675e6c8556224229c (patch)
tree8890415d135581eb045326d377185b396a810b4f
parent69af0d3a3c62120d6571b8e078c1b0d52397785f (diff)
parent9d945773a757ce87b587e5c6642f63e5626ca44c (diff)
downloadrsyslog-99e21ffa873e2ee3e12640f675e6c8556224229c.tar.gz
rsyslog-99e21ffa873e2ee3e12640f675e6c8556224229c.tar.bz2
rsyslog-99e21ffa873e2ee3e12640f675e6c8556224229c.zip
Merge branch 'v7-stable'
-rw-r--r--ChangeLog3
-rw-r--r--plugins/imfile/imfile.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d91523ee..c4d25ab8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,9 @@ Version 7.5.0 [devel] 2013-06-11
Version 7.4.4 [v7.4-stable] 2013-0?-??
- better error messages in GuardTime signature provider
Thanks to Ahto Truu for providing the patch.
+- bugfix: imfile parameter "persistStateInterval" was unusable
+ due to a case typo in imfile; work-around was to use legacy config
+ Thanks to Brandon Murphy for reporting this bug.
- bugfix: TLV16 flag encoding error in signature files from GT provider
This fixes a problem where the TLV16 flag was improperly encoded.
Unfortunately, existing files already have the bug and may not properly
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
index 2e80ffc8..45882fb2 100644
--- a/plugins/imfile/imfile.c
+++ b/plugins/imfile/imfile.c
@@ -478,7 +478,7 @@ CODESTARTnewInpInst
inst->readMode = pvals[i].val.d.n;
} else if(!strcmp(inppblk.descr[i].name, "maxlinesatonce")) {
inst->maxLinesAtOnce = pvals[i].val.d.n;
- } else if(!strcmp(inppblk.descr[i].name, "persistStateInterval")) {
+ } else if(!strcmp(inppblk.descr[i].name, "persiststateinterval")) {
inst->iPersistStateInterval = pvals[i].val.d.n;
} else if(!strcmp(inppblk.descr[i].name, "maxsubmitatonce")) {
inst->nMultiSub = pvals[i].val.d.n;