m_passforward: Don't forward password if the connect block required a password to...

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

diff --git a/src/server.cpp b/src/server.cpp
index 5590f05f907091f88d0558421929434a03e21363..7fd62fdf85830fbd8d0d3296946e8f28a55e91da 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -169,7 +169,7 @@ void ISupportManager::Build()
 
        tokens["AWAYLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxAway);
        tokens["CASEMAPPING"] = "rfc1459";
-       tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MASK_CHANNEL);
+       tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL);
        tokens["CHANNELLEN"] = ConvToStr(ServerInstance->Config->Limits.ChanMax);
        tokens["CHANTYPES"] = "#";
        tokens["ELIST"] = "MU";
@@ -184,8 +184,7 @@ void ISupportManager::Build()
        tokens["STATUSMSG"] = ServerInstance->Modes->BuildPrefixes(false);
        tokens["TOPICLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxTopic);
 
-       tokens["FNC"] = tokens["VBANLIST"] =
-               tokens["WALLCHOPS"] = tokens["WALLVOICES"];
+       tokens["FNC"] = tokens["VBANLIST"];
 
        // Modules can add new tokens and also edit or remove existing tokens
        FOREACH_MOD(On005Numeric, (tokens));