summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-03-13 11:04:33 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-03-13 11:04:33 +0000
commit17f36a76cbf15e088d2973ed5608f93e09827f8a (patch)
treeb6c13e0b6552821b39770011e161d46f8b647065 /plugins/imtcp
parent49c52d090aea8dc898cc855278b1054daff1461f (diff)
downloadrsyslog-17f36a76cbf15e088d2973ed5608f93e09827f8a.tar.gz
rsyslog-17f36a76cbf15e088d2973ed5608f93e09827f8a.tar.xz
rsyslog-17f36a76cbf15e088d2973ed5608f93e09827f8a.zip
bugfix: imgssapi segfaulted under some conditions; this fix is actually not
just a fix but a change in the object model. Thanks to varmojfekoj for providing the bug report, an initial fix and lots of good discussion that lead to where we finally ended up.
Diffstat (limited to 'plugins/imtcp')
-rw-r--r--plugins/imtcp/imtcp.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c
index ed0131b8..7baa95f2 100644
--- a/plugins/imtcp/imtcp.c
+++ b/plugins/imtcp/imtcp.c
@@ -70,15 +70,6 @@ isPermittedHost(struct sockaddr *addr, char *fromHostFQDN, void __attribute__((u
}
-static rsRetVal
-onSessAccept(tcpsrv_t *pThis, tcps_sess_t **ppSess, int fd)
-{
- DEFiRet;
- iRet = tcpsrv.SessAccept(pThis, ppSess, fd);
- RETiRet;
-}
-
-
static int*
doOpenLstnSocks(tcpsrv_t *pSrv)
{
@@ -132,7 +123,6 @@ static rsRetVal addTCPListener(void __attribute__((unused)) *pVal, uchar *pNewVa
CHKiRet(tcpsrv.SetCBIsPermittedHost(pOurTcpsrv, isPermittedHost));
CHKiRet(tcpsrv.SetCBRcvData(pOurTcpsrv, doRcvData));
CHKiRet(tcpsrv.SetCBOpenLstnSocks(pOurTcpsrv, doOpenLstnSocks));
- CHKiRet(tcpsrv.SetCBOnSessAccept(pOurTcpsrv, onSessAccept));
CHKiRet(tcpsrv.SetCBOnRegularClose(pOurTcpsrv, onRegularClose));
CHKiRet(tcpsrv.SetCBOnErrClose(pOurTcpsrv, onErrClose));
tcpsrv.configureTCPListen(pOurTcpsrv, (char *) pNewVal);