summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-11-25 17:10:24 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-11-25 17:10:24 +0100
commit36606b01b5dbc9642517e39631b5f3a654d6fe7b (patch)
tree53d565796d082fc3110bc4362ac7e19a598161ca
parent8f61bf333cc900d0a963ffe0f98a256681aff990 (diff)
downloadrsyslog-36606b01b5dbc9642517e39631b5f3a654d6fe7b.tar.gz
rsyslog-36606b01b5dbc9642517e39631b5f3a654d6fe7b.tar.bz2
rsyslog-36606b01b5dbc9642517e39631b5f3a654d6fe7b.zip
bugfix: supportoctetcountedframing parameter did not work in imptcp
-rw-r--r--ChangeLog1
-rw-r--r--plugins/imptcp/imptcp.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d5e6262..cfb3a95f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ Version 7.2.4 [v7-stable] 2012-10-??
... actually, they are microseconds. So the fractional part of the
timestamp was not properly formatted. (import from 5.10.2)
Thanks to Marius Tomaschewski for the bug report and the patch idea.
+- bugfix: supportoctetcountedframing parameter did not work in imptcp
----------------------------------------------------------------------------
Version 7.2.3 [v7-stable] 2012-10-21
- regression fix: rsyslogd terminated when wild-card $IncludeConfig did not
diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c
index 8150fc33..9888086f 100644
--- a/plugins/imptcp/imptcp.c
+++ b/plugins/imptcp/imptcp.c
@@ -1444,7 +1444,7 @@ CODESTARTnewInpInst
inst->pszInputName = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
} else if(!strcmp(inppblk.descr[i].name, "ruleset")) {
inst->pszBindRuleset = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
- } else if(!strcmp(inppblk.descr[i].name, "supportOctetCountedFraming")) {
+ } else if(!strcmp(inppblk.descr[i].name, "supportoctetcountedframing")) {
inst->bSuppOctetFram = (int) pvals[i].val.d.n;
} else if(!strcmp(inppblk.descr[i].name, "keepalive")) {
inst->bKeepAlive = (int) pvals[i].val.d.n;