summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2007-06-30 19:47:46 +0000
committerpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2007-06-30 19:47:46 +0000
commit9ec0ed03e69d3b31176f71fa1b7b68bca5b5c9f0 (patch)
treed956c1a69c3efb7bc2158a26640ee1d6137cbc07
parent04b820b329f4be18cafe86cd4204d2c84d5acf65 (diff)
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
-rw-r--r--src/cmd_eline.cpp3
-rw-r--r--src/cmd_gline.cpp3
-rw-r--r--src/cmd_kline.cpp3
3 files changed, 6 insertions, 3 deletions
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],'@'))