From 9ec0ed03e69d3b31176f71fa1b7b68bca5b5c9f0 Mon Sep 17 00:00:00 2001
From: peavey
Date: Sat, 30 Jun 2007 19:47:46 +0000
Subject: Split hostmask with XLines::IdentSplit then re-inject into check for
 proper detection. Thx owine.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7415 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/cmd_eline.cpp | 3 ++-
 src/cmd_gline.cpp | 3 ++-
 src/cmd_kline.cpp | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index 981a10f32..793f7a413 100644
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -29,7 +29,8 @@ CmdResult cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (pcnt >= 3)
 	{
-		if (ServerInstance->HostMatchesEveryone(parameters[0],user))
+		IdentHostPair ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
 			return CMD_FAILURE;
 
 		if (!strchr(parameters[0],'@'))
diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index afec3889c..f208d40bf 100644
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -29,7 +29,8 @@ CmdResult cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (pcnt >= 3)
 	{
-		if (ServerInstance->HostMatchesEveryone(parameters[0],user))
+		IdentHostPair ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
 			return CMD_FAILURE;
 
 		if (!strchr(parameters[0],'@'))
diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 90ddca55c..05856893a 100644
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -29,7 +29,8 @@ CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (pcnt >= 3)
 	{
-		if (ServerInstance->HostMatchesEveryone(parameters[0],user))
+		IdentHostPair ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
 			return CMD_FAILURE;
 
 		if (!strchr(parameters[0],'@'))
-- 
cgit v1.3.1-10-gc9f91