summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2010-04-25 23:12:27 +0000
committerAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2010-04-25 23:12:27 +0000
commit582212b3614d9dc544ea70a6f237e7846bfba7fb (patch)
treed3a3eb0eee3577e4345af4ba99ce9a84bef8f250
parent1528727cc8d59ca9ef9e9929ad4ae598e7f19771 (diff)
Allow superadmins and ulines to join channels always
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2916 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--src/regchannel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index 0efb7d676..582266956 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -574,12 +574,12 @@ bool ChannelInfo::CheckKick(User *user)
return false;
if (user->isSuperAdmin == 1)
- return true;
+ return false;
/* 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 true;
+ return false;
if (this->HasFlag(CI_SUSPENDED) || this->HasFlag(CI_FORBIDDEN))
{