From caded702bf11d677c1a163da9055888eb06e1fe6 Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Tue, 20 Sep 2016 05:38:03 +0100
Subject: Fix compatibility with the legacy <channels> tag.

We should only use OperMaxChans if they have the right privilege.
---
 src/channels.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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;
-- 
cgit v1.2.3