summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2016-09-20 05:38:03 +0100
committerPeter Powell <petpow@saberuk.com>2016-09-20 05:38:03 +0100
commitcaded702bf11d677c1a163da9055888eb06e1fe6 (patch)
tree5e324075df4536cfe657bc8d208382a788e3b011
parentfcd538761adad5834c0b6c4c14b43bea9f8bfd6d (diff)
Fix compatibility with the legacy <channels> tag.
We should only use OperMaxChans if they have the right privilege.
-rw-r--r--src/channels.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index 49fa75f98..bc23c680a 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -181,7 +181,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
{
unsigned int opermaxchans = ConvToInt(user->oper->getConfig("maxchans"));
// If not set, use 2.0's <channels:opers>, if that's not set either, use limit from CC
- if (!opermaxchans)
+ if (!opermaxchans && user->HasPrivPermission("channels/high-join-limit"))
opermaxchans = ServerInstance->Config->OperMaxChans;
if (opermaxchans)
maxchans = opermaxchans;