X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_admin.cpp;h=293768759448106c96a889800b23c7001b628f61;hb=dbf4d595433ecefeb61f1267ffa515a91c3ab548;hp=c090cb071fb3ccabdc6189875a8a053fbeab96f2;hpb=dd36852a52e8541306b76c5b88bce8ab9b36654c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/override_admin.cpp b/src/modules/m_spanningtree/override_admin.cpp
index c090cb071..293768759 100644
--- a/src/modules/m_spanningtree/override_admin.cpp
+++ b/src/modules/m_spanningtree/override_admin.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	  the file COPYING for details.
@@ -12,36 +12,27 @@
  */
 
 /* $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 "wildcard.h"
-#include "xline.h"      
-#include "transport.h"  
-			
-#include "m_spanningtree/timesynctimer.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/rconnect.h"
-#include "m_spanningtree/rsquit.h"
+#include "xline.h"
+
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h */
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
-int ModuleSpanningTree::HandleAdmin(const char* const* parameters, int pcnt, User* user)
+ModResult ModuleSpanningTree::HandleAdmin(const std::vector<std::string>& parameters, User* user)
 {
-	if (pcnt > 0)
+	if (parameters.size() > 0)
 	{
-		if (match(ServerInstance->Config->ServerName, parameters[0]))
-			return 0;
+		if (InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0]))
+			return MOD_RES_PASSTHRU;
 
 		/* Remote ADMIN, the server is within the 1st parameter */
-		std::deque<std::string> params;
+		parameterlist params;
 		params.push_back(parameters[0]);
 		/* Send it out remotely, generate no reply yet */
 		TreeServer* s = Utils->FindServerMask(parameters[0]);
@@ -51,9 +42,9 @@ int ModuleSpanningTree::HandleAdmin(const char* const* parameters, int pcnt, Use
 			Utils->DoOneToOne(user->uuid, "ADMIN", params, s->GetName());
 		}
 		else
-			user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
-		return 1;
+			user->WriteNumeric(ERR_NOSUCHSERVER, "%s %s :No such server", user->nick.c_str(), parameters[0].c_str());
+		return MOD_RES_DENY;
 	}
-	return 0;
+	return MOD_RES_PASSTHRU;
 }