Check in eline, gline and kline for the @ which signifies an ident. Without the ident...

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4929 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index 6ee43d16f81fbdb3285162ebc8e65c504aeff8c2..27cad8c210fcfcdd48e88d1827eb3c4f76a080a0 100644 (file)
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -33,6 +33,12 @@ void cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
                if (ServerInstance->HostMatchesEveryone(parameters[0],user))
                        return;
 
+               if (!strchr(parameters[0],'@'))
+               {
+                       user->WriteServ("NOTICE %s :*** E-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
+                       return;
+               }
+
                ServerInstance->XLines->add_eline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
                FOREACH_MOD(I_OnAddELine,OnAddELine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
 

diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index eda52095b5d0b8bf2e0c6fe969e6e9c6bc01bf86..b7c22c467e643f91ac91e03beb7e6b60fe996d35 100644 (file)
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -33,6 +33,12 @@ void cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
                if (ServerInstance->HostMatchesEveryone(parameters[0],user))
                        return;
 
+               if (!strchr(parameters[0],'@'))
+               {       
+                       user->WriteServ("NOTICE %s :*** G-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
+                       return;
+               }
+
                ServerInstance->XLines->add_gline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
                FOREACH_MOD(I_OnAddGLine,OnAddGLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
 

diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 02a928f1116dbfaa167a21bdb3aaa3ea0d5be0d1..52cbba26edd2ad1051607163887a715a74c9ee1e 100644 (file)
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -38,6 +38,12 @@ void cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
                if (ServerInstance->HostMatchesEveryone(parameters[0],user))
                        return;
 
+               if (!strchr(parameters[0],'@'))
+               {       
+                       user->WriteServ("NOTICE %s :*** K-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
+                       return;
+               }
+
                ServerInstance->XLines->add_kline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
                FOREACH_MOD(I_OnAddKLine,OnAddKLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));