Merge remote/local MODULES output

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / override_admin.cpp

diff --git a/src/modules/m_spanningtree/override_admin.cpp b/src/modules/m_spanningtree/override_admin.cpp
index 50ab04566b7bf781e32c635a90f76e3053f48db2..2a5cfcdabd035e48fa63fc5d68a473cc5cadfb2a 100644 (file)
--- a/src/modules/m_spanningtree/override_admin.cpp
+++ b/src/modules/m_spanningtree/override_admin.cpp
@@ -14,8 +14,6 @@
 /* $ModDesc: Provides a spanning tree server link protocol */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
 #include "../transport.h"
@@ -27,12 +25,12 @@
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
-int ModuleSpanningTree::HandleAdmin(const std::vector<std::string>& parameters, User* user)
+ModResult ModuleSpanningTree::HandleAdmin(const std::vector<std::string>& parameters, User* user)
 {
        if (parameters.size() > 0)
        {
                if (InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0]))
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                /* Remote ADMIN, the server is within the 1st parameter */
                parameterlist params;
@@ -46,8 +44,8 @@ int ModuleSpanningTree::HandleAdmin(const std::vector<std::string>& parameters,
                }
                else
                        user->WriteNumeric(ERR_NOSUCHSERVER, "%s %s :No such server", user->nick.c_str(), parameters[0].c_str());
-               return 1;
+               return MOD_RES_DENY;
        }
-       return 0;
+       return MOD_RES_PASSTHRU;
 }