diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-29 08:02:37 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-29 08:02:37 +0100 |
| commit | fae8f451ab932a9f1295d2748bc48b076bd43352 (patch) | |
| tree | 4fb1b1f4a34e13d9cf9a4fe4742a69a9532419d0 /plugins/imtcp/imtcp.c | |
| parent | 2275a915e02ca4fd1cd1b3c450b0089ae98bc907 (diff) | |
| parent | 48799529955eff8eb3120b02a356a92a8bd9b2ae (diff) | |
| download | rsyslog-fae8f451ab932a9f1295d2748bc48b076bd43352.tar.gz rsyslog-fae8f451ab932a9f1295d2748bc48b076bd43352.tar.bz2 rsyslog-fae8f451ab932a9f1295d2748bc48b076bd43352.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'plugins/imtcp/imtcp.c')
| -rw-r--r-- | plugins/imtcp/imtcp.c | 7 |
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 |