diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-19 18:04:30 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-19 18:04:30 +0200 |
| commit | 6e28d86c6a0a0c5788c5cb263b71aab19eb54cb5 (patch) | |
| tree | c0aec5692512fdbe783ce23c8260cc3a5102645f /plugins | |
| parent | dac70ef76e14e677f11579b7d11d13ddd92c25c8 (diff) | |
| parent | 6d0250b75fe35e8c20d4a8b4155065c8244b0439 (diff) | |
| download | rsyslog-6e28d86c6a0a0c5788c5cb263b71aab19eb54cb5.tar.gz rsyslog-6e28d86c6a0a0c5788c5cb263b71aab19eb54cb5.tar.xz rsyslog-6e28d86c6a0a0c5788c5cb263b71aab19eb54cb5.zip | |
Merge branch 'v5-stable' into v6-stable
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imptcp/imptcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |