Merge remote/local MODULES output

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

diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp
index 829c698808ac0ed2960ffbcb91824307e90fdd23..5360f176cf9d3a8218e3cc2d63c290b3812785d1 100644 (file)
--- a/src/modules/m_spanningtree/override_squit.cpp
+++ b/src/modules/m_spanningtree/override_squit.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,7 +25,7 @@
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
-int ModuleSpanningTree::HandleSquit(const std::vector<std::string>& parameters, User* user)
+ModResult ModuleSpanningTree::HandleSquit(const std::vector<std::string>& parameters, User* user)
 {
        TreeServer* s = Utils->FindServerMask(parameters[0]);
        if (s)
@@ -35,7 +33,7 @@ int ModuleSpanningTree::HandleSquit(const std::vector<std::string>& parameters,
                if (s == Utils->TreeRoot)
                {
                        user->WriteServ("NOTICE %s :*** SQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)",user->nick.c_str(),parameters[0].c_str());
-                       return 1;
+                       return MOD_RES_DENY;
                }
 
                TreeSocket* sock = s->GetSocket();
@@ -56,6 +54,6 @@ int ModuleSpanningTree::HandleSquit(const std::vector<std::string>& parameters,
        {
                 user->WriteServ("NOTICE %s :*** SQUIT: The server \002%s\002 does not exist on the network.",user->nick.c_str(),parameters[0].c_str());
        }
-       return 1;
+       return MOD_RES_DENY;
 }