summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-05-03 18:21:46 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-05-03 18:21:46 +0200
commit99d9c6d52ced294dee2822d36ede069c2bd37044 (patch)
tree788d1a4e95bfe823cd4db020157c811bac7f1b6a
parent1d7ba92156f5a5ac1783df563ec3344fdf8365df (diff)
downloadrsyslog-99d9c6d52ced294dee2822d36ede069c2bd37044.tar.gz
rsyslog-99d9c6d52ced294dee2822d36ede069c2bd37044.tar.xz
rsyslog-99d9c6d52ced294dee2822d36ede069c2bd37044.zip
bugfix/omfile: template action parameter was not accepted
(and template name set to "??" if the parameter was used) Thanks to Brian Knox for alerting us on this bug.
-rw-r--r--ChangeLog3
-rw-r--r--tools/omfile.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f78259f..adf7bc37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@ Version 6.3.9 [DEVEL] 2012-04-??
stored inside the disk queue.
- bugfix/imuxsock: solving abort if hostname was not set; configured
hostname was not used (both merge regressions)
+ -bugfix/omfile: template action parameter was not accepted
+ (and template name set to "??" if the parameter was used)
+ Thanks to Brian Knox for alerting us on this bug.
---------------------------------------------------------------------------
Version 6.3.8 [DEVEL] 2012-04-16
- added $PStatJSON directive to permit stats records in JSON format
diff --git a/tools/omfile.c b/tools/omfile.c
index c7f1b896..68222883 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -838,7 +838,7 @@ CODESTARTnewActInst
}
CHKiRet(OMSRsetEntry(*ppOMSR, 0, ustrdup((pData->tplName == NULL) ?
- (uchar*)"RSYSLOG_FileFormat" : (uchar*)"??"),
+ (uchar*)"RSYSLOG_FileFormat" : pData->tplName),
OMSR_NO_RQD_TPL_OPTS));
if(pData->bDynamicName) {