Fix access checks on chanprotect preventing use of SAMODE

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

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 276fef038cab386c6695a06b738eb8ce689d5e11..cbe980d058721925f63d6ac923ab57f047a9f2fa 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -23,9 +23,10 @@ class SVSHold : public XLine
 public:
        irc::string nickname;
 
-       SVSHold(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char *nick) : XLine(Instance, s_time, d, src, re, "SVSHOLD")
+       SVSHold(InspIRCd* Instance, time_t s_time, long d, std::string src, std::string re, std::string nick)
+               : XLine(Instance, s_time, d, src, re, "SVSHOLD")
        {
-               this->nickname = nick;
+               this->nickname = nick.c_str();
        }
 
        ~SVSHold()
@@ -48,7 +49,8 @@ public:
 
        void DisplayExpiry()
        {
-               ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)", this->nickname.c_str(), this->source, (long int)(ServerInstance->Time() - this->set_time));
+               ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)",
+                       this->nickname.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
        }
 
        const char* Displayable()
@@ -66,7 +68,7 @@ class SVSHoldFactory : public XLineFactory
 
        /** Generate a shun
        */
-       XLine* Generate(time_t set_time, long duration, const char* source, const char* reason, const char* xline_specific_mask)
+       XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
        {
                return new SVSHold(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
        }
@@ -77,10 +79,9 @@ class SVSHoldFactory : public XLineFactory
 class CommandSvshold : public Command
 {
  public:
-       CommandSvshold(InspIRCd* Me) : Command(Me, "SVSHOLD", "o", 1)
+       CommandSvshold(Module* Creator) : Command(Creator, "SVSHOLD", 1)
        {
-               this->source = "m_svshold.so";
-               this->syntax = "<nickname> [<duration> :<reason>]";
+               flags_needed = 'o'; this->syntax = "<nickname> [<duration> :<reason>]";
                TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
        }
 
@@ -138,6 +139,11 @@ class CommandSvshold : public Command
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleSVSHold : public Module
@@ -147,7 +153,7 @@ class ModuleSVSHold : public Module
 
 
  public:
-       ModuleSVSHold(InspIRCd* Me) : Module(Me), cmd(Me), s(Me)
+       ModuleSVSHold(InspIRCd* Me) : Module(Me), cmd(this), s(Me)
        {
                ServerInstance->XLines->RegisterFactory(&s);
                ServerInstance->AddCommand(&cmd);
@@ -156,26 +162,26 @@ class ModuleSVSHold : public Module
        }
 
 
-       virtual int OnStats(char symbol, User* user, string_list &out)
+       virtual ModResult OnStats(char symbol, User* user, string_list &out)
        {
                if(symbol != 'S')
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                ServerInstance->XLines->InvokeStats("SVSHOLD", 210, user, out);
-               return 1;
+               return MOD_RES_DENY;
        }
 
-       virtual int OnUserPreNick(User *user, const std::string &newnick)
+       virtual ModResult OnUserPreNick(User *user, const std::string &newnick)
        {
                XLine *rl = ServerInstance->XLines->MatchesLine("SVSHOLD", newnick);
 
                if (rl)
                {
-                       user->WriteServ( "432 %s %s :Services reserved nickname: %s", user->nick.c_str(), newnick.c_str(), rl->reason);
-                       return 1;
+                       user->WriteServ( "432 %s %s :Services reserved nickname: %s", user->nick.c_str(), newnick.c_str(), rl->reason.c_str());
+                       return MOD_RES_DENY;
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual ~ModuleSVSHold()