Only send ACCOUNT and CHGHOST to clients that have sent NICK/USER.

[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 1226b601aacb0814e5c17fa2af6ae8b572526357..95a601c7022ca479208a58da73f00d33997b5b55 100644 (file)
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -20,11 +20,15 @@
 
 
 #include "inspircd.h"
+#include "modules/whois.h"
 
 enum
 {
        // From AustHex.
-       RPL_WHOISSERVICE = 310
+       RPL_WHOISSERVICE = 310,
+
+       // From UnrealIRCd.
+       ERR_KILLDENY = 485
 };
 
 /** Handles user mode +k
@@ -61,7 +65,7 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides usermode +k to protect services from kicks, kills, and mode changes.", VF_VENDOR);
+               return Version("Provides user mode +k to protect services from kicks, kills, and mode changes", VF_VENDOR);
        }
 
        void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
@@ -112,7 +116,7 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public
 
                if (dst->IsModeSet(bm))
                {
-                       src->WriteNumeric(485, InspIRCd::Format("You are not permitted to kill %s services!", ServerInstance->Config->Network.c_str()));
+                       src->WriteNumeric(ERR_KILLDENY, InspIRCd::Format("You are not permitted to kill %s services!", ServerInstance->Config->Network.c_str()));
                        ServerInstance->SNO->WriteGlobalSno('a', src->nick+" tried to kill service "+dst->nick+" ("+reason+")");
                        return MOD_RES_DENY;
                }