Fix incorrect ModResult for noctcp user target.

[user/henk/code/inspircd.git] / src / coremods / core_info / cmd_modules.cpp

diff --git a/src/coremods/core_info/cmd_modules.cpp b/src/coremods/core_info/cmd_modules.cpp
index 47dd2dc9291989882b0da398cebaad973cdf1f9c..d68c8b9fdc00ccdeae035b2fd1a75ebf2f64bdea 100644 (file)
--- a/src/coremods/core_info/cmd_modules.cpp
+++ b/src/coremods/core_info/cmd_modules.cpp
@@ -38,11 +38,11 @@ CommandModules::CommandModules(Module* parent)
 
 /** Handle /MODULES
  */
-CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandModules::Handle(User* user, const Params& parameters)
 {
        // Don't ask remote servers about their modules unless the local user asking is an oper
        // 2.0 asks anyway, so let's handle that the same way
-       bool for_us = (parameters.empty() || parameters[0] == ServerInstance->Config->ServerName);
+       bool for_us = (parameters.empty() || irc::equals(parameters[0], ServerInstance->Config->ServerName));
        if ((!for_us) || (!IS_LOCAL(user)))
        {
                if (!user->IsOper())
@@ -66,17 +66,13 @@ CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, Us
                if (IS_LOCAL(user) && user->HasPrivPermission("servers/auspex"))
                {
                        std::string flags("VCO");
-                       int pos = 0;
+                       size_t pos = 0;
                        for (int mult = 2; mult <= VF_OPTCOMMON; mult *= 2, ++pos)
                                if (!(V.Flags & mult))
                                        flags[pos] = '-';
 
-#ifdef INSPIRCD_STATIC
-                       user->WriteRemoteNumeric(RPL_MODLIST, m->ModuleSourceFile, INSPIRCD_VERSION, flags, V.description);
-#else
                        std::string srcrev = m->ModuleDLLManager->GetVersion();
                        user->WriteRemoteNumeric(RPL_MODLIST, m->ModuleSourceFile, srcrev.empty() ? "*" : srcrev, flags, V.description);
-#endif
                }
                else
                {