diff options
| author | jantje_85 <jantje_85@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-04-17 22:48:13 +0000 |
|---|---|---|
| committer | jantje_85 <jantje_85@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-04-17 22:48:13 +0000 |
| commit | 086ae2c6ce91853e503048ab9e4a532c0b787a96 (patch) | |
| tree | 73cc2b633afb33326d7d777c8efb5ee7456ae3cc | |
| parent | 3e9bd7583c555a23cb4d5b8f91966d0048953e58 (diff) | |
Forward Port of r2284: Don't enfoce akick/forbidden/etc.. settings on clients on ulined servers.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2285 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | Changes | 3 | ||||
| -rw-r--r-- | src/chanserv.c | 10 |
2 files changed, 7 insertions, 6 deletions
@@ -1,7 +1,6 @@ Anope Version 1.9.1 -------------------- - - +F Don't enforce akick/forbidden/etc.-restrictions on clients on ulined servers. Provided by Ankit <ankit@nevitus.com> - 2009 diff --git a/src/chanserv.c b/src/chanserv.c index 0ca584227..790733a48 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -1126,6 +1126,12 @@ int check_kick(User * user, const 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_SUSPENDED || ci->flags & CI_FORBIDDEN) { if (is_oper(user)) @@ -1172,10 +1178,6 @@ int check_kick(User * user, const 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, CHAN_NOT_ALLOWED_TO_JOIN); |