summaryrefslogtreecommitdiffstats
path: root/action.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-03-19 07:29:39 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-03-19 07:29:39 +0100
commit140fbd575885a87fbde8af3ca73bc87375c17bf5 (patch)
treec012cbaef889ecf750dc38da610834b33d8c34c6 /action.c
parent53a5f00046c42de6bd25bc4531ccef3bae62e277 (diff)
downloadrsyslog-140fbd575885a87fbde8af3ca73bc87375c17bf5.tar.gz
rsyslog-140fbd575885a87fbde8af3ca73bc87375c17bf5.tar.xz
rsyslog-140fbd575885a87fbde8af3ca73bc87375c17bf5.zip
action cfg: do no longer require template for TPL_AS_MSG passing mode
Diffstat (limited to 'action.c')
-rw-r--r--action.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/action.c b/action.c
index f671ce5a..91399f49 100644
--- a/action.c
+++ b/action.c
@@ -1914,7 +1914,9 @@ addAction(action_t **ppAction, modInfo_t *pMod, void *pModData,
/* Ok, we got everything, so it now is time to look up the template
* (Hint: templates MUST be defined before they are used!)
*/
- if((pAction->ppTpl[i] = tplFind(ourConf, (char*)pTplName, strlen((char*)pTplName))) == NULL) {
+ if( !(iTplOpts & OMSR_TPL_AS_MSG)
+ && (pAction->ppTpl[i] =
+ tplFind(ourConf, (char*)pTplName, strlen((char*)pTplName))) == NULL) {
snprintf(errMsg, sizeof(errMsg) / sizeof(char),
" Could not find template '%s' - action disabled\n",
pTplName);