Fix respecting the deprecated <channels:users> tag.

diff --git a/src/channels.cpp b/src/channels.cpp
index befc1f133ea555de6c3f7e066ec42a5ed30402e8..282199718e1aa44acd4e2733053a90c3d54056b3 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -176,6 +176,8 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
        if (!override)
        {
                unsigned int maxchans = user->GetClass()->maxchans;
+               if (!maxchans)
+                       maxchans = ServerInstance->Config->MaxChans;
                if (user->IsOper())
                {
                        unsigned int opermaxchans = ConvToNum<unsigned int>(user->oper->getConfig("maxchans"));

diff --git a/src/users.cpp b/src/users.cpp
index 69def51546a44a0f10c2f8f4b1b02f81af38502c..bca1c6a7cdfeadafb7214a3c655c6f5a1422a42d 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -1197,10 +1197,24 @@ const std::string& FakeUser::GetFullRealHost()
 }
 
 ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask)
-       : config(tag), type(t), fakelag(true), name("unnamed"), registration_timeout(0), host(mask),
-       pingtime(0), softsendqmax(0), hardsendqmax(0), recvqmax(0),
-       penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxconnwarn(true), maxchans(ServerInstance->Config->MaxChans),
-       limit(0), resolvehostnames(true)
+       : config(tag)
+       , type(t)
+       , fakelag(true)
+       , name("unnamed")
+       , registration_timeout(0)
+       , host(mask)
+       , pingtime(0)
+       , softsendqmax(0)
+       , hardsendqmax(0)
+       , recvqmax(0)
+       , penaltythreshold(0)
+       , commandrate(0)
+       , maxlocal(0)
+       , maxglobal(0)
+       , maxconnwarn(true)
+       , maxchans(0)
+       , limit(0)
+       , resolvehostnames(true)
 {
 }