diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-30 13:12:39 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-30 13:12:39 +0100 |
| commit | 7faeff73ddba0cfcf5accca2bbc2b1e2330d8621 (patch) | |
| tree | 14a79231d11c03893c8f013998b7bdcd523e6161 /tools | |
| parent | b11c85aac8b41eb74fb14c486f88940df8819bbc (diff) | |
| parent | ad1b93df8a83563c23d44ea0df910dd25d26a9d9 (diff) | |
| download | rsyslog-7faeff73ddba0cfcf5accca2bbc2b1e2330d8621.tar.gz rsyslog-7faeff73ddba0cfcf5accca2bbc2b1e2330d8621.tar.bz2 rsyslog-7faeff73ddba0cfcf5accca2bbc2b1e2330d8621.zip | |
Merge branch 'v7-stable'
Conflicts:
configure.ac
doc/manual.html
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/omfwd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/omfwd.c b/tools/omfwd.c index 2fd24bdf..129392d2 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -138,6 +138,7 @@ static struct cnfparamdescr actpdescr[] = { { "streamdriverauthmode", eCmdHdlrGetWord, 0 }, { "streamdriverpermittedpeers", eCmdHdlrGetWord, 0 }, { "resendlastmsgonreconnect", eCmdHdlrBinary, 0 }, + { "template", eCmdHdlrGetWord, 0 }, }; static struct cnfparamblk actpblk = { CNFPARAMBLK_VERSION, @@ -760,6 +761,7 @@ setInstParamDefaults(instanceData *pData) BEGINnewActInst struct cnfparamvals *pvals; + uchar *tplToUse; int i; rsRetVal localRet; CODESTARTnewActInst @@ -881,7 +883,8 @@ CODESTARTnewActInst } CODE_STD_STRING_REQUESTnewActInst(1) - CHKiRet(OMSRsetEntry(*ppOMSR, 0, ustrdup(getDfltTpl()), OMSR_NO_RQD_TPL_OPTS)); + tplToUse = ustrdup((pData->tplName == NULL) ? getDfltTpl() : pData->tplName); + CHKiRet(OMSRsetEntry(*ppOMSR, 0, tplToUse, OMSR_NO_RQD_TPL_OPTS)); CHKiRet(initTCP(pData)); CODE_STD_FINALIZERnewActInst |