Add sanity checks to the ssl modules so that theres no possibility of an out of range...

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

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 1764e6f56689b7f4dfb74af3804c6a2a9aa24aa1..9ac440d5e8ef6b4bd15236c28662280a1ce88c12 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "mode.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "u_listmode.h"
 
 /* $ModDesc: Allows an extended ban (+b) syntax redirecting banned users to another channel */
@@ -66,7 +62,7 @@ class BanRedirect : public ModeWatcher
                        std::string::iterator start_pos = param.begin();
                        long maxbans = channel->GetMaxBans();
                
-                       if(channel->bans.size() > static_cast<unsigned>(maxbans))
+                       if(adding && (channel->bans.size() > static_cast<unsigned>(maxbans)))
                        {
                                source->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)", source->nick, channel->name, channel->name, maxbans);
                                return false;
@@ -225,8 +221,6 @@ class ModuleBanRedirect : public Module
                                irc::modestacker modestack(false);
                                StringDeque stackresult;
                                const char* mode_junk[MAXMODES+2];
-                               userrec* myhorriblefakeuser = new userrec(ServerInstance);
-                               myhorriblefakeuser->SetFd(FD_MAGIC_NUMBER);
                                
                                mode_junk[0] = chan->name;
                                
@@ -248,10 +242,9 @@ class ModuleBanRedirect : public Module
                                                mode_junk[i+1] = stackresult[i].c_str();
                                        }
                                        
-                                       ServerInstance->SendMode(mode_junk, stackresult.size() + 1, myhorriblefakeuser);
+                                       ServerInstance->SendMode(mode_junk, stackresult.size() + 1, ServerInstance->FakeClient);
                                }
                                
-                               DELETE(myhorriblefakeuser);
                                DELETE(redirects);
                                chan->Shrink("banredirects");
                        }
@@ -260,7 +253,7 @@ class ModuleBanRedirect : public Module
 
        virtual void OnRehash(userrec* user, const std::string &param)
        {
-               ExceptionModule = ServerInstance->FindModule("m_banexception.so");
+               ExceptionModule = ServerInstance->Modules->Find("m_banexception.so");
        }
 
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
@@ -302,14 +295,15 @@ class ModuleBanRedirect : public Module
                                                /* tell them they're banned and are being transferred */
                                                chanrec* destchan = ServerInstance->FindChan(redir->targetchan);
                                                
-                                               if(destchan && ServerInstance->FindModule("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit))
+                                               if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit))
                                                {
                                                        user->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name);
                                                        return 1;
                                                }
                                                else
                                                {
-                                                       user->WriteServ("470 %s :You are banned from %s. You are being automatically redirected to %s", user->nick, chan->name, redir->targetchan.c_str());
+                                                       user->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name);
+                                                       user->WriteServ("470 %s :You are being automatically redirected to %s", user->nick, redir->targetchan.c_str());
                                                        nofollow = true;
                                                        chanrec::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", ServerInstance->Time(true));
                                                        nofollow = false;
@@ -335,7 +329,7 @@ class ModuleBanRedirect : public Module
        
        Priority Prioritize()
        {
-               return (Priority)ServerInstance->PriorityBefore("m_banexception.so");
+               return (Priority)ServerInstance->Modules->PriorityBefore("m_banexception.so");
        }
 };