summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/chanserv.c10
1 files changed, 6 insertions, 4 deletions
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);