diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2013-08-06 11:51:43 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2013-08-06 11:51:43 +0200 |
| commit | 7ffa4f675dd90c5ccb19d0cf4e11d543be9a2a6b (patch) | |
| tree | ed95195d9c69b1fa21323e224d2a4ab4d5f2a0e4 | |
| parent | 32ea9f6e0f8e5b301e173d7d06c81c2b80925c1d (diff) | |
| parent | fa54ce21a732916db5d62913dc77f7bb2cb6ad94 (diff) | |
| download | rsyslog-7ffa4f675dd90c5ccb19d0cf4e11d543be9a2a6b.tar.gz rsyslog-7ffa4f675dd90c5ccb19d0cf4e11d543be9a2a6b.tar.bz2 rsyslog-7ffa4f675dd90c5ccb19d0cf4e11d543be9a2a6b.zip | |
Merge branch 'v7-stable'
Conflicts:
plugins/omprog/omprog.c
| -rw-r--r-- | plugins/omprog/omprog.c | 12 | ||||
| -rw-r--r-- | tools/ompipe.c | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/plugins/omprog/omprog.c b/plugins/omprog/omprog.c index 7a6ef056..940ef8d7 100644 --- a/plugins/omprog/omprog.c +++ b/plugins/omprog/omprog.c @@ -441,15 +441,9 @@ CODESTARTnewActInst } } - if(pData->tplName == NULL) { - CHKiRet(OMSRsetEntry(*ppOMSR, 0, (uchar*) strdup("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 diff --git a/tools/ompipe.c b/tools/ompipe.c index 420e2b11..df8066b1 100644 --- a/tools/ompipe.c +++ b/tools/ompipe.c @@ -329,6 +329,10 @@ CODESTARTnewActInst } } + CHKiRet(OMSRsetEntry(*ppOMSR, 0, (uchar*)strdup((pData->tplName == NULL) ? + "RSYSLOG_ForwardFormat" : (char*)pData->tplName), + OMSR_NO_RQD_TPL_OPTS)); + /* Old flawed template code if(pData->tplName == NULL) { CHKiRet(OMSRsetEntry(*ppOMSR, 0, (uchar*) "RSYSLOG_FileFormat", OMSR_NO_RQD_TPL_OPTS)); @@ -336,7 +340,7 @@ CODESTARTnewActInst CHKiRet(OMSRsetEntry(*ppOMSR, 0, (uchar*) strdup((char*) pData->tplName), OMSR_NO_RQD_TPL_OPTS)); - } + }*/ CODE_STD_FINALIZERnewActInst cnfparamvalsDestruct(pvals, &actpblk); ENDnewActInst |