diff options
| author | Michael Biebl <biebl@debian.org> | 2013-09-03 22:42:46 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-09-03 22:42:46 +0200 |
| commit | 0c656246c6818b9fd0426411ed1cf926fbbc907d (patch) | |
| tree | ca5db297c70a912d88b42df3c56a53c304aef5a3 /tools | |
| parent | a400789c367fd3cd8d0f9588ca2af72dcac47c9c (diff) | |
| download | rsyslog-0c656246c6818b9fd0426411ed1cf926fbbc907d.tar.gz | |
Imported Upstream version 7.4.4upstream/7.4.4
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ompipe.c | 6 | ||||
| -rw-r--r-- | tools/rsgtutil.c | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tools/ompipe.c b/tools/ompipe.c index 420e2b1..df8066b 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 diff --git a/tools/rsgtutil.c b/tools/rsgtutil.c index 095b806..567dcf4 100644 --- a/tools/rsgtutil.c +++ b/tools/rsgtutil.c @@ -74,7 +74,7 @@ dumpFile(char *name) if(fp != stdin) fclose(fp); return; -err: fprintf(stderr, "error %d processing file %s\n", r, name); +err: fprintf(stderr, "error %d (%s) processing file %s\n", r, RSGTE2String(r), name); } static void @@ -113,7 +113,7 @@ showSigblkParams(char *name) return; err: if(r != RSGTE_EOF) - fprintf(stderr, "error %d processing file %s\n", r, name); + fprintf(stderr, "error %d (%s) processing file %s\n", r, RSGTE2String(r), name); } static void @@ -145,7 +145,7 @@ detectFileType(char *name) if(fp != stdin) fclose(fp); return; -err: fprintf(stderr, "error %d processing file %s\n", r, name); +err: fprintf(stderr, "error %d (%s) processing file %s\n", r, RSGTE2String(r), name); } static inline int @@ -327,7 +327,7 @@ done: return; err: - fprintf(stderr, "error %d processing file %s\n", r, name); + fprintf(stderr, "error %d (%s) processing file %s\n", r, RSGTE2String(r), name); if(logfp != NULL) fclose(logfp); if(sigfp != NULL) |