summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-08-01 15:46:48 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-08-01 15:46:48 +0200
commitd0bab973d2ddf93af71c859f3ed47dd40d561c76 (patch)
treeca29d8067b2864cc1384c12be201fcdd01878dbb
parenta8122314f96cf8e2e0e08f9a58a3f3fde4aa60ae (diff)
downloadrsyslog-d0bab973d2ddf93af71c859f3ed47dd40d561c76.tar.gz
rsyslog-d0bab973d2ddf93af71c859f3ed47dd40d561c76.tar.xz
rsyslog-d0bab973d2ddf93af71c859f3ed47dd40d561c76.zip
regression: omfile aborted on dynafiles (never released bug)
-rw-r--r--tools/omfile.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/omfile.c b/tools/omfile.c
index a0a7b186..3cc3a7f9 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -938,14 +938,13 @@ CODESTARTparseSelectorAct
++p; /* eat '?' */
CHKiRet(cflineParseFileName(p, fname, *ppOMSR, 0, OMSR_NO_RQD_TPL_OPTS,
(pszFileDfltTplName == NULL) ? (uchar*)"RSYSLOG_FileFormat" : pszFileDfltTplName));
+ pData->f_fname = ustrdup(fname);
+ pData->bDynamicName = 1;
+ pData->iCurrElt = -1; /* no current element */
/* "filename" is actually a template name, we need this as string 1. So let's add it
* to the pOMSR. -- rgerhards, 2007-07-27
*/
CHKiRet(OMSRsetEntry(*ppOMSR, 1, ustrdup(pData->f_fname), OMSR_NO_RQD_TPL_OPTS));
-
- pData->f_fname = ustrdup(fname);
- pData->bDynamicName = 1;
- pData->iCurrElt = -1; /* no current element */
/* we now allocate the cache table */
CHKmalloc(pData->dynCache = (dynaFileCacheEntry**)
calloc(cs.iDynaFileCacheSize, sizeof(dynaFileCacheEntry*)));