cmd_kill: log all kills from or to remote users

[user/henk/code/inspircd.git] / src / channels.cpp

diff --git a/src/channels.cpp b/src/channels.cpp
index 49fa75f9830c23bbb51fcb3a4fd3f8f829b689a5..bc23c680a07b309a83de482bc29ef7c1ed18dd93 100644 (file)
--- 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;