summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp/imtcp.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-12-04 12:59:37 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2008-12-04 12:59:37 +0100
commite02b553e1fdca5a655a58d03066cfbc4ab41bc85 (patch)
tree271518077688e126db7267935983e1ab216474d5 /plugins/imtcp/imtcp.c
parentc5bfd2b24ca8c490401a0835ec741c05acf0ed3e (diff)
parenta453c7d858779736621c336bc1973bbaf6d6d87a (diff)
downloadrsyslog-e02b553e1fdca5a655a58d03066cfbc4ab41bc85.tar.gz
rsyslog-e02b553e1fdca5a655a58d03066cfbc4ab41bc85.tar.xz
rsyslog-e02b553e1fdca5a655a58d03066cfbc4ab41bc85.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf.html plugins/imudp/imudp.c runtime/rsyslog.h
Diffstat (limited to 'plugins/imtcp/imtcp.c')
-rw-r--r--plugins/imtcp/imtcp.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c
index f01a9f0f..89f1dbcf 100644
--- a/plugins/imtcp/imtcp.c
+++ b/plugins/imtcp/imtcp.c
@@ -89,7 +89,7 @@ static int
isPermittedHost(struct sockaddr *addr, char *fromHostFQDN, void __attribute__((unused)) *pUsrSrv,
void __attribute__((unused)) *pUsrSess)
{
- return net.isAllowedSender(net.pAllowedSenders_TCP, addr, fromHostFQDN);
+ return net.isAllowedSender((uchar*) "TCP", addr, fromHostFQDN);
}
@@ -212,10 +212,7 @@ ENDwillRun
BEGINafterRun
CODESTARTafterRun
/* do cleanup here */
- if(net.pAllowedSenders_TCP != NULL) {
- net.clearAllowedSenders(net.pAllowedSenders_TCP);
- net.pAllowedSenders_TCP = NULL;
- }
+ net.clearAllowedSenders((uchar*)"TCP");
ENDafterRun