diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 17:01:16 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 17:01:16 +0200 |
| commit | a1c7bc265554563d1744738994075214e5083566 (patch) | |
| tree | ddf7c6676aa0de18b5986d7e56641465e83fe188 /tcpsrv.c | |
| parent | c5178a4d21cf8ca3362b8a8394d0e762801550a4 (diff) | |
| parent | d071de578454754c4701285b3569e55c5cef1ee4 (diff) | |
| download | rsyslog-a1c7bc265554563d1744738994075214e5083566.tar.gz rsyslog-a1c7bc265554563d1744738994075214e5083566.tar.bz2 rsyslog-a1c7bc265554563d1744738994075214e5083566.zip | |
Merge branch 'runtime'
Conflicts:
ChangeLog
Diffstat (limited to 'tcpsrv.c')
| -rw-r--r-- | tcpsrv.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -54,7 +54,7 @@ #include <fcntl.h> #endif #include "rsyslog.h" -#include "syslogd.h" +#include "dirty.h" #include "cfsysline.h" #include "module-template.h" #include "net.h" @@ -572,7 +572,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]); -RUNLOG_VAR("%p", &pNewSess); SessAccept(pThis, &pNewSess, pThis->pSocksLstn[i+1]); --nfds; /* indicate we have processed one */ } |