diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-08-26 18:42:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-08-26 18:42:45 +0200 |
| commit | c8ac47b5895526b524551c9810ad39f086ee76ca (patch) | |
| tree | 909f7f93a95d3d3940789ac247bfc115f1112dd8 | |
| parent | cb50245748ebcb3c37537fbf79213a650f8dd06b (diff) | |
| parent | a5abbddb5c04b95a6e51a93f71516cee280c54c4 (diff) | |
| download | rsyslog-c8ac47b5895526b524551c9810ad39f086ee76ca.tar.gz rsyslog-c8ac47b5895526b524551c9810ad39f086ee76ca.tar.bz2 rsyslog-c8ac47b5895526b524551c9810ad39f086ee76ca.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | grammar/rainerscript.c | 2 | ||||
| -rw-r--r-- | plugins/imtcp/imtcp.c | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -73,6 +73,8 @@ Version 7.5.0 [devel] 2013-06-11 Thanks to Axel Rau for the patch. --------------------------------------------------------------------------- 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 }, |