X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_gline.cpp;h=f208d40bf6826abb339b69bb49c7f7578f39a531;hb=a2b40829c116cd67d5f293404371eb132dcaa8e3;hp=608f93650a9c164b5913c74cb593928f84f12a58;hpb=11554b8626d8b421cc9cf2c6f6cc3fe2467e0441;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index 608f93650..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],'@'))
@@ -43,20 +44,21 @@ CmdResult cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
 			return CMD_FAILURE;
 		}
 
-		if (ServerInstance->XLines->add_gline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
+		long duration = ServerInstance->Duration(parameters[1]);
+		if (ServerInstance->XLines->add_gline(duration,user->nick,parameters[2],parameters[0]))
 		{
 			int to_apply = APPLY_GLINES;
 
-			FOREACH_MOD(I_OnAddGLine,OnAddGLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+			FOREACH_MOD(I_OnAddGLine,OnAddGLine(duration, user, parameters[2], parameters[0]));
 
-			if (!ServerInstance->Duration(parameters[1]))
+			if (!duration)
 			{
 				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,parameters[0]);
 				to_apply |= APPLY_PERM_ONLY;
 			}
 			else
 			{
-				time_t c_requires_crap = ServerInstance->Duration(parameters[1]) + ServerInstance->Time();
+				time_t c_requires_crap = duration + ServerInstance->Time();
 				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires on %s",user->nick,parameters[0],
 						ServerInstance->TimeString(c_requires_crap).c_str());
 			}