diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-27 12:00:14 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-27 12:00:14 +0200 |
commit | 33316de49b7775ac40dd0ec0f4b7ff6256ccde78 (patch) | |
tree | edeec9b609baf2011838f7dbfcb6fc3bd82f29e7 /plugins/imtcp/imtcp.c | |
parent | aa9426f683fa6af9280bc63050ee0187ba4c57e1 (diff) | |
parent | 35ea061f62cf0cbae074b2df47dc6b462da4fd20 (diff) | |
download | rsyslog-33316de49b7775ac40dd0ec0f4b7ff6256ccde78.tar.gz rsyslog-33316de49b7775ac40dd0ec0f4b7ff6256ccde78.tar.bz2 rsyslog-33316de49b7775ac40dd0ec0f4b7ff6256ccde78.zip |
Merge branch 'master' into ultra-reliable
Conflicts:
tests/Makefile.am
tests/diskqueue.sh
tests/imtcp-multiport.sh
tests/manytcp.sh
tests/memq-persist.sh
Diffstat (limited to 'plugins/imtcp/imtcp.c')
-rw-r--r-- | plugins/imtcp/imtcp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c index acac38b2..7300a799 100644 --- a/plugins/imtcp/imtcp.c +++ b/plugins/imtcp/imtcp.c @@ -180,7 +180,6 @@ static rsRetVal addTCPListener(void __attribute__((unused)) *pVal, uchar *pNewVa } } -dbgprintf("XXX: try add listen port %s\n", pNewVal); /* initialized, now add socket */ CHKiRet(tcpsrv.SetInputName(pOurTcpsrv, pszInputName == NULL ? UCHAR_CONSTANT("imtcp") : pszInputName)); |