X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_shun.cpp;h=66cc7fd58dc488e2a4585d57d76ffa9675bc1ac0;hb=451e687f681ccab5c02a8de1a7d59b324efbfe08;hp=5388bb4856da5a2b078d3a9a8cce9c72a742956e;hpb=b9e11915a976daaf790ebc763aff56e19fd49e0f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 5388bb485..66cc7fd58 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -44,6 +44,9 @@ public:
 		if (InspIRCd::Match(u->GetFullHost(), matchtext) || InspIRCd::Match(u->GetFullRealHost(), matchtext) || InspIRCd::Match(u->nick+"!"+u->ident+"@"+u->GetIPString(), matchtext))
 			return true;
 
+		if (InspIRCd::MatchCIDR(u->GetIPString(), matchtext, ascii_case_insensitive_map))
+			return true;
+
 		return false;
 	}
 
@@ -103,13 +106,17 @@ class CommandShun : public Command
 
 		if (parameters.size() == 1)
 		{
-			if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", user))
+			if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", user))
+			{
+				ServerInstance->SNO->WriteToSnoMask('x', "%s removed SHUN on %s", user->nick.c_str(), parameters[0].c_str());
+			}
+			else if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", user))
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s removed SHUN on %s",user->nick.c_str(),target.c_str());
+				ServerInstance->SNO->WriteToSnoMask('x',"%s removed SHUN on %s", user->nick.c_str(), target.c_str());
 			}
 			else
 			{
-				user->WriteNotice("*** Shun " + target + " not found in list, try /stats H.");
+				user->WriteNotice("*** Shun " + parameters[0] + " not found in list, try /stats H.");
 				return CMD_FAILURE;
 			}
 		}
@@ -188,7 +195,7 @@ class ModuleShun : public Module
 		ServerInstance->XLines->UnregisterFactory(&f);
 	}
 
-	void Prioritize()
+	void Prioritize() CXX11_OVERRIDE
 	{
 		Module* alias = ServerInstance->Modules->Find("m_alias.so");
 		ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, alias);
@@ -214,10 +221,10 @@ class ModuleShun : public Module
 
 		ShunEnabledCommands.clear();
 
-		std::stringstream dcmds(cmds);
+		irc::spacesepstream dcmds(cmds);
 		std::string thiscmd;
 
-		while (dcmds >> thiscmd)
+		while (dcmds.GetToken(thiscmd))
 		{
 			ShunEnabledCommands.insert(thiscmd);
 		}