diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 12:31:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 12:31:56 +0200 |
| commit | 706ddb492345e53d36084d0b843f237da865c6d4 (patch) | |
| tree | 5c21c06e0f4c0ce15fa2d8413c149d687be43e72 /tools/omfile.c | |
| parent | a3a3a322d8c7d40dfed0765457d26a484a624bce (diff) | |
| parent | 2014cf85627b8774e8c36ddecad04f1ebf43020b (diff) | |
| download | rsyslog-706ddb492345e53d36084d0b843f237da865c6d4.tar.gz rsyslog-706ddb492345e53d36084d0b843f237da865c6d4.tar.bz2 rsyslog-706ddb492345e53d36084d0b843f237da865c6d4.zip | |
Merge branch 'master' into master-ratelimit
Conflicts:
ChangeLog
doc/v7compatibility.html
Diffstat (limited to 'tools/omfile.c')
| -rw-r--r-- | tools/omfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/omfile.c b/tools/omfile.c index 2bb51e99..c7e0dc25 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -824,6 +824,7 @@ ENDcreateInstance BEGINfreeInstance CODESTARTfreeInstance + free(pData->tplName); free(pData->f_fname); if(pData->bDynamicName) { dynaFileFreeCache(pData); @@ -969,7 +970,7 @@ CODESTARTnewActInst ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS); } - tplToUse = (pData->tplName == NULL) ? ustrdup(getDfltTpl()) : pData->tplName; + tplToUse = ustrdup((pData->tplName == NULL) ? getDfltTpl() : pData->tplName); CHKiRet(OMSRsetEntry(*ppOMSR, 0, tplToUse, OMSR_NO_RQD_TPL_OPTS)); if(pData->bDynamicName) { |