summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-03-14 09:31:45 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-03-14 09:31:45 +0000
commitde0665a4755140715ad9d95098f6b3a7ff713bd2 (patch)
tree9b9c0e5dd897f7097a9764990228d6f9db90647f
parent7e58cb0779dbb132aede3d29a82a8a4d2d955365 (diff)
downloadrsyslog-de0665a4755140715ad9d95098f6b3a7ff713bd2.tar.gz
rsyslog-de0665a4755140715ad9d95098f6b3a7ff713bd2.tar.xz
rsyslog-de0665a4755140715ad9d95098f6b3a7ff713bd2.zip
cleanup
-rw-r--r--ChangeLog3
-rw-r--r--tcpsrv.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d8f2cc8..0a5218da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
---------------------------------------------------------------------------
Version 3.12.3 (rgerhards), 2008-03-??
+- bugfix: $ModDir should not be reset on $ResetConfig - this can cause a lot
+ of confusion and there is no real good reason to do so. Also conflicts with
+ the new -M option and environment setting.
- some more internal cleanup ;)
---------------------------------------------------------------------------
Version 3.12.2 (rgerhards), 2008-03-13
diff --git a/tcpsrv.c b/tcpsrv.c
index 4030b206..f3fad684 100644
--- a/tcpsrv.c
+++ b/tcpsrv.c
@@ -586,7 +586,6 @@ Run(tcpsrv_t *pThis)
for (i = 0; i < *pThis->pSocksLstn; i++) {
if (FD_ISSET(pThis->pSocksLstn[i+1], &readfds)) {
dbgprintf("New connect on TCP inetd socket: #%d\n", pThis->pSocksLstn[i+1]);
- //pThis->pOnSessAccept(pThis, &pNewSess, pThis->pSocksLstn[i+1]);
SessAccept(pThis, &pNewSess, pThis->pSocksLstn[i+1]);
--nfds; /* indicate we have processed one */
}