diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 15:38:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 15:38:09 +0200 |
| commit | 7bebfd3b60894bd913e3d6cbcad5447a607e0a0b (patch) | |
| tree | 4243c632639de11ccb08eebd014851f1bc3f6711 /tools/omfile.c | |
| parent | 156382746626459aaf64d79eac95183d1ab60680 (diff) | |
| parent | 2ae9e456db8991e61b4aa48cf9b74f6d20689ce4 (diff) | |
| download | rsyslog-7bebfd3b60894bd913e3d6cbcad5447a607e0a0b.tar.gz rsyslog-7bebfd3b60894bd913e3d6cbcad5447a607e0a0b.tar.bz2 rsyslog-7bebfd3b60894bd913e3d6cbcad5447a607e0a0b.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tools/omfile.c')
| -rw-r--r-- | tools/omfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/omfile.c b/tools/omfile.c index 8969d16d..c7e0dc25 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -970,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) { |