Fix a regression from fcb51634669e6ed588e42f2072c6f910e267126f ("fix uid collision...

[user/henk/code/inspircd.git] / src / modules / m_servprotect.cpp

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 6d0dd7f81f8c23bf87861f9c3702b5cc60bc9a4b..7c4aef2899832ff26aba0ca6cd4eab2c0c21a814 100644 (file)
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,12 +12,6 @@
  */
 
 #include "inspircd.h"
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
 
 /* $ModDesc: Provides support for Austhex style +k / UnrealIRCD +S services mode */
 
@@ -30,6 +24,14 @@ class ServProtectMode : public ModeHandler
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
+               /* Because this returns MODEACTION_DENY all the time, there is only ONE
+                * way to add this mode and that is at client introduction in the UID command,
+                * as this calls OnModeChange for each mode but disregards the return values.
+                * The mode cannot be manually added or removed, not even by a server or by a remote
+                * user or uline, which prevents its (ab)use as a kiddie 'god mode' on such networks.
+                * I'm sure if someone really wants to do that they can make a copy of this module
+                * that does the job. It won't be me though!
+                */
                return MODEACTION_DENY;
        }
 
@@ -38,30 +40,30 @@ class ServProtectMode : public ModeHandler
 
 class ModuleServProtectMode : public Module
 {
-       
+
        ServProtectMode* bm;
  public:
        ModuleServProtectMode(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                bm = new ServProtectMode(ServerInstance);
                if (!ServerInstance->Modes->AddMode(bm))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnWhois, I_OnKill, I_OnWhoisLine, I_OnRawMode };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               Implementation eventlist[] = { I_OnWhois, I_OnKill, I_OnWhoisLine, I_OnRawMode, I_OnUserPreKick };
+               ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
-       
+
        virtual ~ModuleServProtectMode()
        {
                ServerInstance->Modes->DelMode(bm);
                delete bm;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_COMMON,API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
        virtual void OnWhois(User* src, User* dst)
@@ -91,7 +93,7 @@ class ModuleServProtectMode : public Module
                                if (u->IsModeSet('k') && ServerInstance->Modes->ModeString(u, chan, false).find(mode) != std::string::npos)
                                {
                                        /* BZZZT, Denied! */
-                                       user->WriteNumeric(482, "%s %s :You are not permitted to deop %s services", user->nick.c_str(), chan->name.c_str(), ServerInstance->Config->Network);
+                                       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);
                                        return ACR_DENY;
                                }
                        }
@@ -108,9 +110,20 @@ class ModuleServProtectMode : public Module
                if (dst->IsModeSet('k'))
                {
                        src->WriteNumeric(485, "%s :You are not permitted to kill %s services!", src->nick.c_str(), ServerInstance->Config->Network);
-                       ServerInstance->SNO->WriteToSnoMask('A', std::string(src->nick)+" tried to kill service "+dst->nick+" ("+reason+")");
+                       ServerInstance->SNO->WriteGlobalSno('a', std::string(src->nick)+" tried to kill service "+dst->nick+" ("+reason+")");
+                       return 1;
+               }
+               return 0;
+       }
+
+       virtual int OnUserPreKick(User *src, User *dst, Channel *c, const std::string &reason)
+       {
+               if (dst->IsModeSet('k'))
+               {
+                       src->WriteNumeric(484, "%s %s :You are not permitted to kick services", src->nick.c_str(), c->name.c_str());
                        return 1;
                }
+
                return 0;
        }