diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-03 12:27:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-03 12:27:59 +0200 |
| commit | 92768240cddf6688dfd7b5d3d10789bae9903406 (patch) | |
| tree | 495cb8f5b2913a72c655a6eb191bee10ce18d3b5 | |
| parent | 8d4a5152cba02d35e55046a687eaddd56dc581fd (diff) | |
| parent | dde11d5b63b268b5addc183b49907cd12feeca39 (diff) | |
| download | rsyslog-92768240cddf6688dfd7b5d3d10789bae9903406.tar.gz rsyslog-92768240cddf6688dfd7b5d3d10789bae9903406.tar.bz2 rsyslog-92768240cddf6688dfd7b5d3d10789bae9903406.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | plugins/omsnmp/omsnmp.c | 2 |
2 files changed, 9 insertions, 1 deletions
@@ -86,6 +86,14 @@ Version 7.4.4 [v7.4-stable] 2013-0?-?? be processed. The fix uses constants from the GuardTime API lib to prevent such problems in the future. Thanks to Ahto Truu for providing the patch. +- bugfix: slightly malformed SMTP handling in ommail +- bugfix: segfault in omprog if no template was provided (now dflt is used) +- bugfix: segfault in ompipe if no template was provided (now dflt is used) +- bugfix: segfault in omsnmp if no template was provided (now dflt is used) +- bugfix: some omsnmp optional config params were flagged as mandatory +- bugfix: segfault in omelasticsearch when resuming queued messages + after restarting Elasticsearch + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=464 - 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 diff --git a/plugins/omsnmp/omsnmp.c b/plugins/omsnmp/omsnmp.c index 8ad424e6..42d1de6b 100644 --- a/plugins/omsnmp/omsnmp.c +++ b/plugins/omsnmp/omsnmp.c @@ -430,7 +430,7 @@ CODESTARTnewActInst } CHKiRet(OMSRsetEntry(*ppOMSR, 0, (uchar*)strdup((pData->tplName == NULL) ? - "RSYSLOG_ForwardFormat" : (char*)pData->tplName), + "RSYSLOG_FileFormat" : (char*)pData->tplName), OMSR_NO_RQD_TPL_OPTS)); CODE_STD_FINALIZERnewActInst |