From fa54ce21a732916db5d62913dc77f7bb2cb6ad94 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Tue, 6 Aug 2013 11:47:34 +0200 Subject: Using OMSRsetEntry to set the default action template in omprog If there was no default template, a segfault occured on startup. --- plugins/omprog/omprog.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'plugins/omprog/omprog.c') 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 -- cgit v1.2.3