summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-04-19 18:04:30 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-04-19 18:04:30 +0200
commit6e28d86c6a0a0c5788c5cb263b71aab19eb54cb5 (patch)
treec0aec5692512fdbe783ce23c8260cc3a5102645f
parentdac70ef76e14e677f11579b7d11d13ddd92c25c8 (diff)
parent6d0250b75fe35e8c20d4a8b4155065c8244b0439 (diff)
downloadrsyslog-6e28d86c6a0a0c5788c5cb263b71aab19eb54cb5.tar.gz
rsyslog-6e28d86c6a0a0c5788c5cb263b71aab19eb54cb5.tar.xz
rsyslog-6e28d86c6a0a0c5788c5cb263b71aab19eb54cb5.zip
Merge branch 'v5-stable' into v6-stable
-rw-r--r--ChangeLog2
-rw-r--r--plugins/imptcp/imptcp.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 766e106b..77b84814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -263,6 +263,8 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-03-??
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236
---------------------------------------------------------------------------
Version 5.8.11 [V5-stable] 2012-04-??
+- bugfix: imptcp input name could not be set
+ config directive was accepted, but had no effect
- bugfix: assigned ruleset was lost when using disk queues
This looked quite hard to diagnose for disk-assisted queues, as the
pure memory part worked well, but ruleset info was lost for messages
diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c
index 3f29aa1d..92383f90 100644
--- a/plugins/imptcp/imptcp.c
+++ b/plugins/imptcp/imptcp.c
@@ -881,14 +881,14 @@ static rsRetVal addTCPListener(void __attribute__((unused)) *pVal, uchar *pNewVa
pSrv->bEmitMsgOnClose = cs.bEmitMsgOnClose;
pSrv->port = pNewVal;
pSrv->iAddtlFrameDelim = cs.iAddtlFrameDelim;
- cs.pszInputName = NULL; /* moved over to pSrv, we do not own */
pSrv->lstnIP = cs.lstnIP;
- cs.lstnIP = NULL; /* moved over to pSrv, we do not own */
pSrv->pRuleset = cs.pRuleset;
pSrv->pszInputName = (cs.pszInputName == NULL) ? UCHAR_CONSTANT("imptcp") : cs.pszInputName;
CHKiRet(prop.Construct(&pSrv->pInputName));
CHKiRet(prop.SetString(pSrv->pInputName, pSrv->pszInputName, ustrlen(pSrv->pszInputName)));
CHKiRet(prop.ConstructFinalize(pSrv->pInputName));
+ cs.pszInputName = NULL; /* moved over to pSrv, we do not own */
+ cs.lstnIP = NULL; /* moved over to pSrv, we do not own */
/* add to linked list */
pSrv->pNext = pSrvRoot;