m_dccallow Validate tokens before use

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

diff --git a/src/modules/m_serverban.cpp b/src/modules/m_serverban.cpp
index 49fd4298fe759b79f47aafa0c719269bf851ae5b..cf77ae9ba75ac99b5cce271eb71e82608c7b7fbd 100644 (file)
--- a/src/modules/m_serverban.cpp
+++ b/src/modules/m_serverban.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | 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) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * 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"
 
 /* $ModDesc: Implements extban +b s: - server name bans */
@@ -19,9 +25,10 @@ class ModuleServerBan : public Module
 {
  private:
  public:
-       ModuleServerBan()       {
+       void init()
+       {
                Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        ~ModuleServerBan()
@@ -30,12 +37,12 @@ class ModuleServerBan : public Module
 
        Version GetVersion()
        {
-               return Version("Extban 's' - server ban",VF_COMMON|VF_VENDOR);
+               return Version("Extban 's' - server ban",VF_OPTCOMMON|VF_VENDOR);
        }
 
        ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
        {
-               if (mask[0] == 's' && mask[1] == ':')
+               if ((mask.length() > 2) && (mask[0] == 's') && (mask[1] == ':'))
                {
                        if (InspIRCd::Match(user->server, mask.substr(2)))
                                return MOD_RES_DENY;