diff options
| author | jantje_85 <jantje_85@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-04-17 22:39:18 +0000 |
|---|---|---|
| committer | jantje_85 <jantje_85@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-04-17 22:39:18 +0000 |
| commit | 027567b4b09564041c56a3d5cc2628a13162d280 (patch) | |
| tree | b8ef83e8057fb24867d9f940c9cd930e11b75c04 | |
| parent | 25e81f6ea9d8a051dd5d3aa8a93a57fe088879c7 (diff) | |
Don't enfoce akick/forbidden/etc.. settings on clients on ulined servers.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2284 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | src/chanserv.c | 10 | ||||
| -rw-r--r-- | version.log | 3 |
3 files changed, 9 insertions, 5 deletions
@@ -21,6 +21,7 @@ Provided by Anope Dev. <team@anope.org> - 2009 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] +04/18 F Don't enforce akicks/forbidden/.. on clients on ulined servers. [ #00] Provided by Adam <Adam@SubZeroIRC.net> - 2009 01/28 F Added internal support for +j channelmodes. [#1001] diff --git a/src/chanserv.c b/src/chanserv.c index 4fdaa212c..b9784522f 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -1499,6 +1499,12 @@ int check_kick(User * user, char *chan, time_t chants) if (user->isSuperAdmin == 1) return 0; + /* We don't enforce services restrictions on clients on ulined services + * as this will likely lead to kick/rejoin floods. ~ Viper */ + if (is_ulined(user->server->name)) { + return 0; + } + if (ci->flags & CI_VERBOTEN) { get_idealban(ci, user, mask, sizeof(mask)); reason = @@ -1552,10 +1558,6 @@ int check_kick(User * user, char *chan, time_t chants) } } - if (is_ulined(user->server->name)) { - return 0; - } - if (check_access(user, ci, CA_NOJOIN)) { get_idealban(ci, user, mask, sizeof(mask)); reason = getstring(user->na, CHAN_NOT_ALLOWED_TO_JOIN); diff --git a/version.log b/version.log index 83fc9c1cc..caee2e3cd 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,11 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="0" VERSION_EXTRA="-svn" -VERSION_BUILD="2253" +VERSION_BUILD="2284" # $Log$ # Changes since 1.8.0 Release +#Revision 2284 - Don't enfoce akick/forbidden/etc.. settings on clients on ulined servers. #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. |