diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-19 07:29:39 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-19 07:29:39 +0100 |
| commit | 140fbd575885a87fbde8af3ca73bc87375c17bf5 (patch) | |
| tree | c012cbaef889ecf750dc38da610834b33d8c34c6 | |
| parent | 53a5f00046c42de6bd25bc4531ccef3bae62e277 (diff) | |
| download | rsyslog-140fbd575885a87fbde8af3ca73bc87375c17bf5.tar.gz rsyslog-140fbd575885a87fbde8af3ca73bc87375c17bf5.tar.xz rsyslog-140fbd575885a87fbde8af3ca73bc87375c17bf5.zip | |
action cfg: do no longer require template for TPL_AS_MSG passing mode
| -rw-r--r-- | action.c | 4 | ||||
| -rw-r--r-- | runtime/objomsr.c | 1 |
2 files changed, 3 insertions, 2 deletions
@@ -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); diff --git a/runtime/objomsr.c b/runtime/objomsr.c index 1ac45e86..a1dad1c8 100644 --- a/runtime/objomsr.c +++ b/runtime/objomsr.c @@ -94,7 +94,6 @@ finalize_it: rsRetVal OMSRsetEntry(omodStringRequest_t *pThis, int iEntry, uchar *pTplName, int iTplOpts) { assert(pThis != NULL); - assert(pTplName != NULL); assert(iEntry < pThis->iNumEntries); if(pThis->ppTplName[iEntry] != NULL) |