Remove needless sockaddr[2] allocations, replace with irc::sockets::sockaddrs union

[user/henk/code/inspircd.git] / src / modes / umode_s.cpp

diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp
index d7f508066694a8463542429cb7bac97b12506f01..0c1c30948bbf2533a935cd073e5dbcde75692fa2 100644 (file)
--- a/src/modes/umode_s.cpp
+++ b/src/modes/umode_s.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -23,10 +23,6 @@ ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHan
 
 ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string &parameter, bool adding, bool servermode)
 {
-       /* Only opers can change other users modes */
-       if ((source != dest) && (!IS_OPER(source)))
-               return MODEACTION_DENY;
-
        /* Set the array fields */
        if (adding)
        {
@@ -34,8 +30,8 @@ ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Chan
                if (!dest->modes[UM_SNOMASK])
                        dest->snomasks.reset();
 
-               parameter = dest->ProcessNoticeMasks(parameter.c_str());
                dest->modes[UM_SNOMASK] = true;
+               parameter = dest->ProcessNoticeMasks(parameter.c_str());
                return MODEACTION_ALLOW;
        }
        else