Backport of bugfix for bug #1004 from SVN r2003, Modechanges from uli…

…ned server are no longer being blocked by SECUREOPS. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2253 5417fbe8-f217-4b02-8779-1006273d7864
anope · Apr 3, 2009 · 74c5d98 · 74c5d98
1 parent 1dec3ee
commit 74c5d98
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/Changes b/Changes
@@ -20,6 +20,7 @@ Provided by Anope Dev. <team@anope.org> - 2009
 03/23 F Force a user off a nick when it is suspended.                    [#1065]
 03/23 F Fixed CS SET MLOCK requiring a param to allow clearing.          [#1044]
 03/30 F Fantasy commands in CTCP ACTIONs will now be ignored.            [#1073]
+04/03 F SECUREOPS now igores modechanges from ulined servers.            [#1004]
 
 Provided by Adam <Adam@SubZeroIRC.net> - 2009
 01/28 F Added internal support for +j channelmodes.                      [#1001]

diff --git a/src/channels.c b/src/channels.c
@@ -302,6 +302,11 @@ void chan_set_modes(const char *source, Channel * chan, int ac, char **av,
         }
     }
 
+    /* Don't bounce modes from u:lined clients or servers, bug #1004. */
+    user = finduser(source);
+    if ((user && is_ulined(user->server->name)) || is_ulined((char *)source))
+        return;
+
     if (check > 0) {
         check_modes(chan);
 
@@ -312,12 +317,12 @@ void chan_set_modes(const char *source, Channel * chan, int ac, char **av,
             real_ac--;
             real_av++;
             for (i = 0; i < real_ac; i++) {
-				if ((user = finduser(*real_av)) && is_on_chan(chan, user)) {
-					if (check < 2)
-						chan_set_correct_modes(user, chan, 0);
-					else if ((chan->ci->flags) && (chan->ci->flags & CI_SECUREOPS))
-						chan_set_correct_modes(user, chan, 0);
-				}
+                if ((user = finduser(*real_av)) && is_on_chan(chan, user)) {
+                    if (check < 2)
+                        chan_set_correct_modes(user, chan, 0);
+                    else if ((chan->ci->flags) && (chan->ci->flags & CI_SECUREOPS))
+                        chan_set_correct_modes(user, chan, 0);
+                }
                 real_av++;
             }
         }

diff --git a/version.log b/version.log
@@ -9,10 +9,11 @@ VERSION_MAJOR="1"
 VERSION_MINOR="8"
 VERSION_PATCH="0"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="2251"
+VERSION_BUILD="2253"
 
 # $Log$ # Changes since 1.8.0 Release
 
+#Revision 2253 - Backport of bugfix for bug #1004 from SVN r2003, Modechanges from ulined server are no longer being blocked by SECUREOPS.
 #Revision 2251 - Fixed non-standard C-style comment.
 #Revision 2250 - Updated example.conf regarding removal of the inspirc10 protocol module and SRA requirement for SuperAdmin.
 #Revision 2249 - Someone seems to have forgotten about Changes.. added most significant commits to Changes.