summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-08-26 18:41:59 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-08-26 18:41:59 +0200
commita5abbddb5c04b95a6e51a93f71516cee280c54c4 (patch)
treefe311745f404bd38dfa3d316255182081b34d97c
parenta508691d7080b91060858f8a739c7df4f1813b2d (diff)
downloadrsyslog-a5abbddb5c04b95a6e51a93f71516cee280c54c4.tar.gz
rsyslog-a5abbddb5c04b95a6e51a93f71516cee280c54c4.tar.bz2
rsyslog-a5abbddb5c04b95a6e51a93f71516cee280c54c4.zip
bugfix: imtcp addtlframedelimiter could not be set to zero
Thanks to Chris Norton for alerting us.
-rw-r--r--ChangeLog2
-rw-r--r--grammar/rainerscript.c2
-rw-r--r--plugins/imtcp/imtcp.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index aacf8c94..eb87d667 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
---------------------------------------------------------------------------
Version 7.4.4 [v7.4-stable] 2013-0?-??
+- bugfix: imtcp addtlframedelimiter could not be set to zero
+ Thanks to Chris Norton for alerting us.
- doc bugfix: remove no-longer existing omtemplate from developer doc
was specifically mentioned as a sample for creating new plugins
Thanks to Yannick Brosseau for alerting us of this problem.
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
index 0f0b469c..2b8d600d 100644
--- a/grammar/rainerscript.c
+++ b/grammar/rainerscript.c
@@ -854,7 +854,7 @@ nvlstGetParam(struct nvlst *valnode, struct cnfparamdescr *param,
r = doGetInt(valnode, param, val);
break;
case eCmdHdlrNonNegInt:
- r = doGetPositiveInt(valnode, param, val);
+ r = doGetNonNegInt(valnode, param, val);
break;
case eCmdHdlrPositiveInt:
r = doGetPositiveInt(valnode, param, val);
diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c
index 2d9761cb..d2a0e565 100644
--- a/plugins/imtcp/imtcp.c
+++ b/plugins/imtcp/imtcp.c
@@ -138,7 +138,7 @@ static struct cnfparamdescr modpdescr[] = {
{ "disablelfdelimiter", eCmdHdlrBinary, 0 },
{ "octetcountedframing", eCmdHdlrBinary, 0 },
{ "notifyonconnectionclose", eCmdHdlrBinary, 0 },
- { "addtlframedelimiter", eCmdHdlrPositiveInt, 0 },
+ { "addtlframedelimiter", eCmdHdlrNonNegInt, 0 },
{ "maxsessions", eCmdHdlrPositiveInt, 0 },
{ "maxlistners", eCmdHdlrPositiveInt, 0 },
{ "maxlisteners", eCmdHdlrPositiveInt, 0 },