diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-18 10:11:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-18 10:11:13 +0200 |
| commit | ab853d305aca4be134efba202c5d93f2a5929dbe (patch) | |
| tree | e3ecbf82c0afb197abed255f34a1f619ae658f20 | |
| parent | 409fe2b073888cc90e6cf426c4bf104c86907146 (diff) | |
| parent | 98745101a103d1aef7a6c79cec8708729a2895fa (diff) | |
| download | rsyslog-ab853d305aca4be134efba202c5d93f2a5929dbe.tar.gz rsyslog-ab853d305aca4be134efba202c5d93f2a5929dbe.tar.bz2 rsyslog-ab853d305aca4be134efba202c5d93f2a5929dbe.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | plugins/imfile/imfile.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -104,6 +104,10 @@ Version 7.4.5 [v7.4-stable] 2013-09-?? - bugfix: doc: imuxsock legacy param $SystemLogSocketParseTrusted was misspelled Thanks to David Lang for alerting us +- bugfix: imfile "facility" input parameter improperly handled + caused facility not to be set, and severity to be overwritten with + the facility value. + Thanks to forum user dmunny for reporting this bug. - bugfix: small memory leak in imfile when $ResetConfigVariables was used Thanks to Grégory Nuyttens for reporting this bug and providig a fix - bugfix: segfault on startup if TLS was used but no CA cert set diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c index 9f6fd644..e4ce3c2d 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -479,7 +479,7 @@ CODESTARTnewInpInst } else if(!strcmp(inppblk.descr[i].name, "severity")) { inst->iSeverity = pvals[i].val.d.n; } else if(!strcmp(inppblk.descr[i].name, "facility")) { - inst->iSeverity = pvals[i].val.d.n; + inst->iFacility = pvals[i].val.d.n; } else if(!strcmp(inppblk.descr[i].name, "readmode")) { inst->readMode = (uint8_t) pvals[i].val.d.n; } else if(!strcmp(inppblk.descr[i].name, "escapelf")) { |