X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_servprotect.cpp;h=340246cc888841f2a9c49e3752e5deb83e7bdce0;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=7fd867e9b1c4657a1371b726db487e16078addf6;hpb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 7fd867e9b..340246cc8 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -56,7 +56,7 @@ class ModuleServProtectMode : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides support for Austhex style +k / UnrealIRCD +S services mode", VF_COMMON | VF_VENDOR);
+		return Version("Provides support for Austhex style +k / UnrealIRCD +S services mode", VF_VENDOR);
 	}
 
 	void OnWhois(User* src, User* dst)
@@ -79,11 +79,12 @@ class ModuleServProtectMode : public Module
 			User *u = ServerInstance->FindNick(param);
 			if (u)
 			{
+				Membership* memb = chan->GetUser(u);
 				/* The target user has +k set on themselves, and you are trying to remove a privilege mode the user has set on themselves.
 				 * This includes any prefix permission mode, even those registered in other modules, e.g. +qaohv. Using ::ModeString()
 				 * here means that the number of modes is restricted to only modes the user has, limiting it to as short a loop as possible.
 				 */
-				if (u->IsModeSet('k') && ServerInstance->Modes->ModeString(u, chan, false).find(mode) != std::string::npos)
+				if (u->IsModeSet('k') && memb && memb->modes.find(mode) != std::string::npos)
 				{
 					/* BZZZT, Denied! */
 					user->WriteNumeric(482, "%s %s :You are not permitted to remove privileges from %s services", user->nick.c_str(), chan->name.c_str(), ServerInstance->Config->Network.c_str());