diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2013-08-06 11:47:34 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2013-08-06 11:47:34 +0200 |
| commit | fa54ce21a732916db5d62913dc77f7bb2cb6ad94 (patch) | |
| tree | a9795ef3d3292a2dd164b6c9407068408c58548a /plugins/omprog/omprog.c | |
| parent | eea77a5bf6ff93db07b6bd3ad07cbe07fdf249ca (diff) | |
| download | rsyslog-fa54ce21a732916db5d62913dc77f7bb2cb6ad94.tar.gz rsyslog-fa54ce21a732916db5d62913dc77f7bb2cb6ad94.tar.bz2 rsyslog-fa54ce21a732916db5d62913dc77f7bb2cb6ad94.zip | |
Using OMSRsetEntry to set the default action template in omprog
If there was no default template, a segfault occured on startup.
Diffstat (limited to 'plugins/omprog/omprog.c')
| -rw-r--r-- | plugins/omprog/omprog.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/plugins/omprog/omprog.c b/plugins/omprog/omprog.c index e425b428..69261656 100644 --- a/plugins/omprog/omprog.c +++ b/plugins/omprog/omprog.c @@ -350,14 +350,9 @@ CODESTARTnewActInst } } - if(pData->tplName == NULL) { - CHKiRet(OMSRsetEntry(*ppOMSR, 0, (uchar*) "RSYSLOG_FileFormat", - OMSR_NO_RQD_TPL_OPTS)); - } else { - CHKiRet(OMSRsetEntry(*ppOMSR, 0, - (uchar*) strdup((char*) pData->tplName), - OMSR_NO_RQD_TPL_OPTS)); - } + CHKiRet(OMSRsetEntry(*ppOMSR, 0, (uchar*)strdup((pData->tplName == NULL) ? + "RSYSLOG_FileFormat" : (char*)pData->tplName), + OMSR_NO_RQD_TPL_OPTS)); CODE_STD_FINALIZERnewActInst cnfparamvalsDestruct(pvals, &actpblk); ENDnewActInst |