apparently ar -s is equivalent to ranlib, except it doesnt have a fucking noisy non...

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

diff --git a/src/modes/umode_n.cpp b/src/modes/umode_n.cpp
index 98b97094e197ee853e0413bb1b2ecea6fedb8cf1..b669f3ae268007b123108395c09a46567e8c90fa 100644 (file)
--- a/src/modes/umode_n.cpp
+++ b/src/modes/umode_n.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,15 +21,19 @@ ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHan
 {
 }
 
-ModeAction ModeUserServerNoticeMask::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string &parameter, bool adding)
 {
        /* Only opers can change other users modes */
        if ((source != dest) && (!*source->oper))
                return MODEACTION_DENY;
 
-       /* Set the bitfields */
+       /* Set the array fields */
        if (adding)
        {
+               /* Fix for bug #310 reported by Smartys */
+               if (!dest->modes[UM_SNOMASK])
+                       memset(dest->snomasks, 0, sizeof(dest->snomasks));
+
                parameter = dest->ProcessNoticeMasks(parameter.c_str());
                dest->modes[UM_SNOMASK] = true;
                if (!dest->modes[UM_SERVERNOTICE])
@@ -39,10 +43,13 @@ ModeAction ModeUserServerNoticeMask::OnModeChange(userrec* source, userrec* dest
                }
                return MODEACTION_ALLOW;
        }
-       else if (dest->modes[UM_SNOMASK] != false)
+       else
        {
-               dest->modes[UM_SNOMASK] = false;
-               return MODEACTION_ALLOW;
+               if (dest->modes[UM_SNOMASK] != false)
+               {
+                       dest->modes[UM_SNOMASK] = false;
+                       return MODEACTION_ALLOW;
+               }
        }
 
        /* Allow the change */