From 52aec3dd2a8a30719b678ea04741c6a36ba82990 Mon Sep 17 00:00:00 2001
From: brain
Date: Sun, 10 Sep 2006 17:18:58 +0000
Subject: Match IP's with klines, glines and exceptions, as well as hosts

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5201 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/users.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/users.cpp')

diff --git a/src/users.cpp b/src/users.cpp
index 53d46ceb8..ee348fac4 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -973,7 +973,7 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
 		userrec::QuitUser(Instance, _new,"Server is full");
 		return;
 	}
-	char* e = Instance->XLines->matches_exception(ipaddr);
+	char* e = Instance->XLines->matches_exception(_new);
 	if (!e)
 	{
 		char* r = Instance->XLines->matches_zline(ipaddr);
@@ -1070,11 +1070,11 @@ void userrec::FullConnect(CullList* Goners)
 
 	char match_against[MAXBUF];
 	snprintf(match_against,MAXBUF,"%s@%s", this->ident, this->host);
-	char* e = ServerInstance->XLines->matches_exception(match_against);
+	char* e = ServerInstance->XLines->matches_exception(this);
 
 	if (!e)
 	{
-		char* r = ServerInstance->XLines->matches_gline(match_against);
+		char* r = ServerInstance->XLines->matches_gline(this);
 		
 		if (r)
 		{
@@ -1084,7 +1084,7 @@ void userrec::FullConnect(CullList* Goners)
 			return;
 		}
 		
-		r = ServerInstance->XLines->matches_kline(match_against);
+		r = ServerInstance->XLines->matches_kline(this);
 		
 		if (r)
 		{
-- 
cgit v1.3.1-10-gc9f91