From 086ae2c6ce91853e503048ab9e4a532c0b787a96 Mon Sep 17 00:00:00 2001
From: jantje_85 <jantje_85@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Fri, 17 Apr 2009 22:48:13 +0000
Subject: 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
---
 src/chanserv.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

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);
-- 
cgit