m_ssl_openssl Fix inverted check that prevented certificates from being recognized...

[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 1e61986e51c45d0f79bcabbe694b46dcf0735735..ee52a5cfbb8d058dfad23061c5872e475cf9c224 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -1,16 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007, 2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "u_listmode.h"
 
@@ -128,7 +139,7 @@ class BanRedirect : public ModeWatcher
                                                return false;
                                        }
 
-                                       Channel *c = ServerInstance->FindChan(mask[CHAN].c_str());
+                                       Channel *c = ServerInstance->FindChan(mask[CHAN]);
                                        if (!c)
                                        {
                                                source->WriteNumeric(690, "%s :Target channel %s must exist to be set as a redirect.",source->nick.c_str(),mask[CHAN].c_str());
@@ -158,7 +169,7 @@ class BanRedirect : public ModeWatcher
                                        }
 
                                        /* Here 'param' doesn't have the channel on it yet */
-                                       redirects->push_back(BanRedirectEntry(mask[CHAN].c_str(), param.c_str()));
+                                       redirects->push_back(BanRedirectEntry(mask[CHAN], param));
 
                                        /* Now it does */
                                        param.append(mask[CHAN]);
@@ -216,16 +227,9 @@ class ModuleBanRedirect : public Module
                if(!ServerInstance->Modes->AddModeWatcher(&re))
                        throw ModuleException("Could not add mode watcher");
 
-               OnRehash(NULL);
-
-               ServerInstance->Extensions.Register(&re.extItem);
-               Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete };
-               ServerInstance->Modules->Attach(list, this, 3);
-       }
-
-       virtual void OnChannelDelete(Channel* chan)
-       {
-               OnCleanup(TYPE_CHANNEL, chan);
+               ServerInstance->Modules->AddService(re.extItem);
+               Implementation list[] = { I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(list, this, sizeof(list)/sizeof(Implementation));
        }
 
        virtual void OnCleanup(int target_type, void* item)
@@ -263,19 +267,8 @@ class ModuleBanRedirect : public Module
                }
        }
 
-       virtual void OnRehash(User* user)
-       {
-       }
-
        virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
-               /* This prevents recursion when a user sets multiple ban redirects in a chain
-                * (thanks Potter)
-                */
-               if (nofollow)
-                       return MOD_RES_PASSTHRU;
-
-               /* Return 1 to prevent the join, 0 to allow it */
                if (chan)
                {
                        BanRedirectList* redirects = re.extItem.get(chan);
@@ -303,6 +296,16 @@ class ModuleBanRedirect : public Module
                                {
                                        if(InspIRCd::Match(user->GetFullRealHost(), redir->banmask) || InspIRCd::Match(user->GetFullHost(), redir->banmask) || InspIRCd::MatchCIDR(ipmask, redir->banmask))
                                        {
+                                               /* This prevents recursion when a user sets multiple ban redirects in a chain
+                                                * (thanks Potter)
+                                                *
+                                                * If we're here and nofollow is true then we're already redirecting this user
+                                                * and there's a redirecting ban set on this channel that matches him, too.
+                                                * Deny both joins.
+                                                */
+                                               if (nofollow)
+                                                       return MOD_RES_DENY;
+
                                                /* tell them they're banned and are being transferred */
                                                Channel* destchan = ServerInstance->FindChan(redir->targetchan);
                                                std::string destlimit;
@@ -342,12 +345,6 @@ class ModuleBanRedirect : public Module
        {
                return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR);
        }
-
-       void Prioritize()
-       {
-               Module* banex = ServerInstance->Modules->Find("m_banexception.so");
-               ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_BEFORE, &banex);
-       }
 };
 
 MODULE_INIT(ModuleBanRedirect)