]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_spanningtree.cpp
Fix for bug #134 reported by mixx941: When user connects to ircd with no usermodes...
[user/henk/code/inspircd.git] / src / modules / m_spanningtree.cpp
index f9a89bf5ca5c01a6cd105f5b0bfa0182bcec5ed3..335624ec5d4e68780f05a0d5d3f13c28d73f4e6f 100644 (file)
 
 using namespace std;
 
-#include <stdio.h>
-#include <vector>
-#include <deque>
-#include "globals.h"
-#include "inspircd_config.h"
-#include "hash_map.h"
 #include "configreader.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "commands.h"
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-
 #include "inspircd.h"
 #include "wildcard.h"
-#include "inspstring.h"
-#include "hashcomp.h"
 #include "xline.h"
-#include "typedefs.h"
 #include "cull_list.h"
 #include "aes.h"
 
@@ -602,7 +591,7 @@ class cmd_rconnect : public command_t
                if (ServerInstance->MatchText(ServerInstance->Config->ServerName,parameters[0]))
                {
                        /* Yes, initiate the given connect */
-                       ServerInstance->WriteOpers("*** Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick,parameters[0],parameters[1]);
+                       ServerInstance->SNO->WriteToSnoMask('l',"Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick,parameters[0],parameters[1]);
                        const char* para[1];
                        para[0] = parameters[1];
                        Creator->OnPreCommand("CONNECT", para, 1, user, true);
@@ -700,12 +689,12 @@ class TreeSocket : public InspSocket
                keylength = key.length();
                if (!(keylength == 16 || keylength == 24 || keylength == 32))
                {
-                       this->Instance->WriteOpers("*** \2ERROR\2: Key length for encryptionkey is not 16, 24 or 32 bytes in length!");
+                       this->Instance->SNO->WriteToSnoMask('l',"\2ERROR\2: Key length for encryptionkey is not 16, 24 or 32 bytes in length!");
                        ServerInstance->Log(DEBUG,"Key length not 16, 24 or 32 characters!");
                }
                else
                {
-                       this->Instance->WriteOpers("*** \2AES\2: Initialized %d bit encryption to server %s",keylength*8,SName.c_str());
+                       this->Instance->SNO->WriteToSnoMask('l',"\2AES\2: Initialized %d bit encryption to server %s",keylength*8,SName.c_str());
                        ctx_in->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
                                \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", keylength, keylength);
                        ctx_out->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
@@ -728,13 +717,13 @@ class TreeSocket : public InspSocket
                        {
                                if (x->Name == this->myhost)
                                {
-                                       this->Instance->WriteOpers("*** Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] established.");
+                                       this->Instance->SNO->WriteToSnoMask('l',"Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] established.");
                                        this->SendCapabilities();
                                        if (x->EncryptionKey != "")
                                        {
                                                if (!(x->EncryptionKey.length() == 16 || x->EncryptionKey.length() == 24 || x->EncryptionKey.length() == 32))
                                                {
-                                                       this->Instance->WriteOpers("\2WARNING\2: Your encryption key is NOT 16, 24 or 32 characters in length, encryption will \2NOT\2 be enabled.");
+                                                       this->Instance->SNO->WriteToSnoMask('l',"\2WARNING\2: Your encryption key is NOT 16, 24 or 32 characters in length, encryption will \2NOT\2 be enabled.");
                                                }
                                                else
                                                {
@@ -753,7 +742,7 @@ class TreeSocket : public InspSocket
                 * If that happens the connection hangs here until it's closed. Unlikely
                 * and rather harmless.
                 */
-               this->Instance->WriteOpers("*** Connection to \2"+myhost+"\2 lost link tag(!)");
+               this->Instance->SNO->WriteToSnoMask('l',"Connection to \2"+myhost+"\2 lost link tag(!)");
                return true;
        }
        
@@ -765,7 +754,7 @@ class TreeSocket : public InspSocket
                 */
                if (e == I_ERR_CONNECT)
                {
-                       this->Instance->WriteOpers("*** Connection failed: Connection refused");
+                       this->Instance->SNO->WriteToSnoMask('l',"Connection failed: Connection refused");
                }
        }
 
@@ -1705,7 +1694,9 @@ class TreeSocket : public InspSocket
                /* This used to have a pretty craq'y loop doing the same thing,
                 * now we just let the STL do the hard work (more efficiently)
                 */
-               params[5] = params[5].substr(params[5].find_first_not_of('+'));
+               std::string::size_type pos_after_plus = params[5].find_first_not_of('+');
+               if (pos_after_plus != std::string::npos)
+                       params[5] = params[5].substr(pos_after_plus);
                
                const char* tempnick = params[1].c_str();
                ServerInstance->Log(DEBUG,"Introduce client %s!%s@%s",tempnick,params[4].c_str(),params[2].c_str());
@@ -1735,12 +1726,14 @@ class TreeSocket : public InspSocket
                for (std::string::iterator v = params[5].begin(); v != params[5].end(); v++)
                        _new->modes[(*v)-65] = 1;
 
+#ifdef SUPPORT_IP6LINKS
                if (params[6].find_first_of(":") != std::string::npos)
                        _new->SetSockAddr(AF_INET6, params[6].c_str(), 0);
                else
+#endif
                        _new->SetSockAddr(AF_INET, params[6].c_str(), 0);
 
-               this->Instance->WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",_new->server,_new->nick,_new->ident,_new->host, _new->GetIPString());
+               this->Instance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s]",_new->server,_new->nick,_new->ident,_new->host, _new->GetIPString());
 
                params[7] = ":" + params[7];
                DoOneToAllButSender(source,"NICK",params,source);
@@ -1926,7 +1919,7 @@ class TreeSocket : public InspSocket
                std::string endburst = "ENDBURST";
                // Because by the end of the netburst, it  could be gone!
                std::string name = s->GetName();
-               this->Instance->WriteOpers("*** Bursting to \2"+name+"\2.");
+               this->Instance->SNO->WriteToSnoMask('l',"Bursting to \2"+name+"\2.");
                this->WriteLine(burst);
                /* send our version string */
                this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" VERSION :"+this->Instance->GetVersionString());
@@ -1939,7 +1932,7 @@ class TreeSocket : public InspSocket
                this->SendXLines(s);            
                FOREACH_MOD_I(this->Instance,I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)TreeProtocolModule,(void*)this));
                this->WriteLine(endburst);
-               this->Instance->WriteOpers("*** Finished bursting to \2"+name+"\2.");
+               this->Instance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+name+"\2.");
        }
 
        /* This function is called when we receive data from a remote
@@ -2035,7 +2028,7 @@ class TreeSocket : public InspSocket
        {
                if (params.size() < 1)
                        return false;
-               this->Instance->WriteOpers("*** ERROR from %s: %s",(InboundServerName != "" ? InboundServerName.c_str() : myhost.c_str()),params[0].c_str());
+               this->Instance->SNO->WriteToSnoMask('l',"ERROR from %s: %s",(InboundServerName != "" ? InboundServerName.c_str() : myhost.c_str()),params[0].c_str());
                /* we will return false to cause the socket to close. */
                return false;
        }
@@ -2043,9 +2036,6 @@ class TreeSocket : public InspSocket
        /* remote MOTD. leet, huh? */
        bool Motd(std::string prefix, std::deque<std::string> &params)
        {
-               /* Get the reply to a STATS query if it matches this servername,
-                * and send it back as a load of PUSH queries
-                */
                if (params.size() > 0)
                {
                        if (this->Instance->MatchText(this->Instance->Config->ServerName, params[0]))
@@ -2091,6 +2081,47 @@ class TreeSocket : public InspSocket
                return true;
        }
 
+       /* remote ADMIN. leet, huh? */
+       bool Admin(std::string prefix, std::deque<std::string> &params)
+       {
+               if (params.size() > 0)
+               {
+                       if (this->Instance->MatchText(this->Instance->Config->ServerName, params[0]))
+                       {
+                               /* It's for our server */
+                               string_list results;
+                               userrec* source = this->Instance->FindNick(prefix);
+
+                               if (source)
+                               {
+                                       std::deque<std::string> par;
+                                       par.push_back(prefix);
+                                       par.push_back("");
+
+                                       par[1] = std::string("::")+ServerInstance->Config->ServerName+" 256 "+source->nick+" :Administrative info for "+ServerInstance->Config->ServerName;
+                                       DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+
+                                       par[1] = std::string("::")+ServerInstance->Config->ServerName+" 257 "+source->nick+" :Name     - "+ServerInstance->Config->AdminName;
+                                       DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+
+                                       par[1] = std::string("::")+ServerInstance->Config->ServerName+" 258 "+source->nick+" :Nickname - "+ServerInstance->Config->AdminNick;
+                                       DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+
+                                       par[1] = std::string("::")+ServerInstance->Config->ServerName+" 258 "+source->nick+" :E-Mail   - "+ServerInstance->Config->AdminEmail;
+                                       DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+                               }
+                       }
+                       else
+                       {
+                               /* Pass it on */
+                               userrec* source = this->Instance->FindNick(prefix);
+                               if (source)
+                                       DoOneToOne(prefix, "ADMIN", params, params[0]);
+                       }
+               }
+               return true;
+       }
+
        bool Stats(std::string prefix, std::deque<std::string> &params)
        {
                /* Get the reply to a STATS query if it matches this servername,
@@ -2204,7 +2235,7 @@ class TreeSocket : public InspSocket
 
                if (this->Instance->MatchText(this->Instance->Config->ServerName,servermask))
                {
-                       this->Instance->WriteOpers("*** Remote rehash initiated from server \002"+prefix+"\002.");
+                       this->Instance->SNO->WriteToSnoMask('l',"Remote rehash initiated from server \002"+prefix+"\002.");
                        this->Instance->RehashServer();
                        ReadConfiguration(false);
                }
@@ -2380,7 +2411,7 @@ class TreeSocket : public InspSocket
                        break;
                        default:
                                /* Just in case... */
-                               this->Instance->WriteOpers("*** \2WARNING\2: Invalid xline type '"+params[0]+"' sent by server "+prefix+", ignored!");
+                               this->Instance->SNO->WriteToSnoMask('x',"\2WARNING\2: Invalid xline type '"+params[0]+"' sent by server "+prefix+", ignored!");
                                propogate = false;
                        break;
                }
@@ -2390,11 +2421,11 @@ class TreeSocket : public InspSocket
                {
                        if (atoi(params[4].c_str()))
                        {
-                               this->Instance->WriteOpers("*** %s Added %cLINE on %s to expire in %lu seconds (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),atoi(params[4].c_str()),params[5].c_str());
+                               this->Instance->SNO->WriteToSnoMask('x',"%s Added %cLINE on %s to expire in %lu seconds (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),atoi(params[4].c_str()),params[5].c_str());
                        }
                        else
                        {
-                               this->Instance->WriteOpers("*** %s Added permenant %cLINE on %s (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),params[5].c_str());
+                               this->Instance->SNO->WriteToSnoMask('x',"%s Added permenant %cLINE on %s (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),params[5].c_str());
                        }
                        params[5] = ":" + params[5];
                        DoOneToAllButSender(prefix,"ADDLINE",params,prefix);
@@ -2607,14 +2638,14 @@ class TreeSocket : public InspSocket
                if (CheckDupe)
                {
                        this->WriteLine("ERROR :Server "+servername+" already exists!");
-                       this->Instance->WriteOpers("*** Server connection from \2"+servername+"\2 denied, already exists");
+                       this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+servername+"\2 denied, already exists");
                        return false;
                }
                TreeServer* Node = new TreeServer(this->Instance,servername,description,ParentOfThis,NULL);
                ParentOfThis->AddChild(Node);
                params[3] = ":" + params[3];
                DoOneToAllButSender(prefix,"SERVER",params,prefix);
-               this->Instance->WriteOpers("*** Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")");
+               this->Instance->SNO->WriteToSnoMask('l',"Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")");
                return true;
        }
 
@@ -2631,7 +2662,7 @@ class TreeSocket : public InspSocket
                if (hops)
                {
                        this->WriteLine("ERROR :Server too far away for authentication");
-                       this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication");
+                       this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server is too far away for authentication");
                        return false;
                }
                std::string description = params[3];
@@ -2643,7 +2674,7 @@ class TreeSocket : public InspSocket
                                if (CheckDupe)
                                {
                                        this->WriteLine("ERROR :Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!");
-                                       this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
+                                       this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
                                        return false;
                                }
                                // Begin the sync here. this kickstarts the
@@ -2664,7 +2695,7 @@ class TreeSocket : public InspSocket
                        }
                }
                this->WriteLine("ERROR :Invalid credentials");
-               this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials");
+               this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, invalid link credentials");
                return false;
        }
 
@@ -2681,7 +2712,7 @@ class TreeSocket : public InspSocket
                if (hops)
                {
                        this->WriteLine("ERROR :Server too far away for authentication");
-                       this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication");
+                       this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server is too far away for authentication");
                        return false;
                }
                std::string description = params[3];
@@ -2693,7 +2724,7 @@ class TreeSocket : public InspSocket
                                if (CheckDupe)
                                {
                                        this->WriteLine("ERROR :Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!");
-                                       this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
+                                       this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
                                        return false;
                                }
                                /* If the config says this link is encrypted, but the remote side
@@ -2703,10 +2734,10 @@ class TreeSocket : public InspSocket
                                if ((x->EncryptionKey != "") && (!this->ctx_in))
                                {
                                        this->WriteLine("ERROR :This link requires AES encryption to be enabled. Plaintext connection refused.");
-                                       this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, remote server did not enable AES.");
+                                       this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, remote server did not enable AES.");
                                        return false;
                                }
-                               this->Instance->WriteOpers("*** Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] ("+description+")");
+                               this->Instance->SNO->WriteToSnoMask('l',"Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] ("+description+")");
                                this->InboundServerName = sname;
                                this->InboundDescription = description;
                                // this is good. Send our details: Our server name and description and hopcount of 0,
@@ -2718,7 +2749,7 @@ class TreeSocket : public InspSocket
                        }
                }
                this->WriteLine("ERROR :Invalid credentials");
-               this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials");
+               this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, invalid link credentials");
                return false;
        }
 
@@ -2771,7 +2802,7 @@ class TreeSocket : public InspSocket
                }
                else if ((this->ctx_in) && (command == "AES"))
                {
-                       this->Instance->WriteOpers("*** \2AES\2: Encryption already enabled on this connection yet %s is trying to enable it twice!",params[0].c_str());
+                       this->Instance->SNO->WriteToSnoMask('l',"\2AES\2: Encryption already enabled on this connection yet %s is trying to enable it twice!",params[0].c_str());
                }
 
                switch (this->LinkState)
@@ -2839,13 +2870,13 @@ class TreeSocket : public InspSocket
                                                long delta = THEM-time(NULL);
                                                if ((delta < -600) || (delta > 600))
                                                {
-                                                       this->Instance->WriteOpers("*** \2ERROR\2: Your clocks are out by %d seconds (this is more than ten minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs(delta));
+                                                       this->Instance->SNO->WriteToSnoMask('l',"\2ERROR\2: Your clocks are out by %d seconds (this is more than ten minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs(delta));
                                                        this->WriteLine("ERROR :Your clocks are out by "+ConvToStr(abs(delta))+" seconds (this is more than ten minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
                                                        return false;
                                                }
                                                else if ((delta < -60) || (delta > 60))
                                                {
-                                                       this->Instance->WriteOpers("*** \2WARNING\2: Your clocks are out by %d seconds, please consider synching your clocks.",abs(delta));
+                                                       this->Instance->SNO->WriteToSnoMask('l',"\2WARNING\2: Your clocks are out by %d seconds, please consider synching your clocks.",abs(delta));
                                                }
                                        }
                                        this->LinkState = CONNECTED;
@@ -2946,6 +2977,10 @@ class TreeSocket : public InspSocket
                                {
                                        return this->Motd(prefix, params);
                                }
+                               else if (command == "ADMIN")
+                               {
+                                       return this->Admin(prefix, params);
+                               }
                                else if (command == "SERVER")
                                {
                                        return this->RemoteServer(prefix,params);
@@ -3095,7 +3130,7 @@ class TreeSocket : public InspSocket
                                        {
                                                sourceserv = this->InboundServerName;
                                        }
-                                       this->Instance->WriteOpers("*** Received end of netburst from \2%s\2",sourceserv.c_str());
+                                       this->Instance->SNO->WriteToSnoMask('l',"Received end of netburst from \2%s\2",sourceserv.c_str());
                                        return true;
                                }
                                else
@@ -3186,7 +3221,7 @@ class TreeSocket : public InspSocket
        {
                if (this->LinkState == CONNECTING)
                {
-                       this->Instance->WriteOpers("*** CONNECT: Connection to \002"+myhost+"\002 timed out.");
+                       this->Instance->SNO->WriteToSnoMask('l',"CONNECT: Connection to \002"+myhost+"\002 timed out.");
                }
        }
 
@@ -3273,7 +3308,7 @@ class ServernameResolver : public Resolver
                        else
                        {
                                /* Something barfed, show the opers */
-                               ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno));
+                               ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno));
                                delete newsocket;
                        }
                }
@@ -3282,7 +3317,7 @@ class ServernameResolver : public Resolver
        void OnError(ResolverError e, const std::string &errormessage)
        {
                /* Ooops! */
-               ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s",MyLink.Name.c_str(),errormessage.c_str());
+               ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s",MyLink.Name.c_str(),errormessage.c_str());
        }
 };
 
@@ -3544,53 +3579,60 @@ void ReadConfiguration(bool rebind)
                L.HiddenFromStats = Conf->ReadFlag("link","hidden",j);
                L.NextConnectTime = time(NULL) + L.AutoConnect;
                /* Bugfix by brain, do not allow people to enter bad configurations */
-               if ((L.IPAddr != "") && (L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port))
+               if (L.Name != ServerInstance->Config->ServerName)
                {
-                       ValidIPs.push_back(L.IPAddr);
+                       if ((L.IPAddr != "") && (L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port))
+                       {
+                               ValidIPs.push_back(L.IPAddr);
 
-                       if (Allow.length())
-                               ValidIPs.push_back(Allow);
+                               if (Allow.length())
+                                       ValidIPs.push_back(Allow);
 
-                       /* Needs resolving */
-                       insp_inaddr binip;
-                       if (insp_aton(L.IPAddr.c_str(), &binip) < 1)
+                               /* Needs resolving */
+                               insp_inaddr binip;
+                               if (insp_aton(L.IPAddr.c_str(), &binip) < 1)
+                               {
+                                       try
+                                       {
+                                               SecurityIPResolver* sr = new SecurityIPResolver(ServerInstance, L.IPAddr, L);
+                                               ServerInstance->AddResolver(sr);
+                                       }
+                                       catch (ModuleException& e)
+                                       {
+                                               ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
+                                       }
+                               }
+
+                               LinkBlocks.push_back(L);
+                               ServerInstance->Log(DEBUG,"m_spanningtree: Read server %s with host %s:%d",L.Name.c_str(),L.IPAddr.c_str(),L.Port);
+                       }
+                       else
                        {
-                               try
+                               if (L.IPAddr == "")
+                               {
+                                       ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', IP address not defined!",L.Name.c_str());
+                               }
+                               else if (L.RecvPass == "")
+                               {
+                                       ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', recvpass not defined!",L.Name.c_str());
+                               }
+                               else if (L.SendPass == "")
+                               {
+                                       ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', sendpass not defined!",L.Name.c_str());
+                               }
+                               else if (L.Name == "")
                                {
-                                       SecurityIPResolver* sr = new SecurityIPResolver(ServerInstance, L.IPAddr, L);
-                                       ServerInstance->AddResolver(sr);
+                                       ServerInstance->Log(DEFAULT,"Invalid configuration, link tag without a name!");
                                }
-                               catch (ModuleException& e)
+                               else if (!L.Port)
                                {
-                                       ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
+                                       ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', no port specified!",L.Name.c_str());
                                }
                        }
-
-                       LinkBlocks.push_back(L);
-                       ServerInstance->Log(DEBUG,"m_spanningtree: Read server %s with host %s:%d",L.Name.c_str(),L.IPAddr.c_str(),L.Port);
                }
                else
                {
-                       if (L.IPAddr == "")
-                       {
-                               ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', IP address not defined!",L.Name.c_str());
-                       }
-                       else if (L.RecvPass == "")
-                       {
-                               ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', recvpass not defined!",L.Name.c_str());
-                       }
-                       else if (L.SendPass == "")
-                       {
-                               ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', sendpass not defined!",L.Name.c_str());
-                       }
-                       else if (L.Name == "")
-                       {
-                               ServerInstance->Log(DEFAULT,"Invalid configuration, link tag without a name!");
-                       }
-                       else if (!L.Port)
-                       {
-                               ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', no port specified!",L.Name.c_str());
-                       }
+                       ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', link tag has the same server name as the local server!",L.Name.c_str());
                }
        }
        DELETE(Conf);
@@ -3771,6 +3813,29 @@ class ModuleSpanningTree : public Module
                return 0;
        }
 
+       int HandleAdmin(const char** parameters, int pcnt, userrec* user)
+       {
+               if (pcnt > 0)
+               {
+                       /* Remote ADMIN, the server is within the 1st parameter */
+                       std::deque<std::string> params;
+                       params.push_back(parameters[0]);
+
+                       /* Send it out remotely, generate no reply yet */
+                       TreeServer* s = FindServerMask(parameters[0]);
+                       if (s)
+                       {
+                               DoOneToOne(user->nick, "ADMIN", params, s->GetName());
+                       }
+                       else
+                       {
+                               user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
+                       }
+                       return 1;
+               }
+               return 0;
+       }
+
        int HandleStats(const char** parameters, int pcnt, userrec* user)
        {
                if (pcnt > 1)
@@ -3874,7 +3939,7 @@ class ModuleSpanningTree : public Module
                        if (sock)
                        {
                                ServerInstance->Log(DEBUG,"Splitting server %s",s->GetName().c_str());
-                               ServerInstance->WriteOpers("*** SQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick);
+                               ServerInstance->SNO->WriteToSnoMask('l',"SQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick);
                                sock->Squit(s,"Server quit by "+std::string(user->nick)+"!"+std::string(user->ident)+"@"+std::string(user->host));
                                ServerInstance->SE->DelFd(sock);
                                sock->Close();
@@ -3956,7 +4021,7 @@ class ModuleSpanningTree : public Module
                                        else
                                        {
                                                // they didnt answer, boot them
-                                               ServerInstance->WriteOpers("*** Server \002%s\002 pinged out",serv->GetName().c_str());
+                                               ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 pinged out",serv->GetName().c_str());
                                                sock->Squit(serv,"Ping timeout");
                                                ServerInstance->SE->DelFd(sock);
                                                sock->Close();
@@ -3980,7 +4045,7 @@ class ModuleSpanningTree : public Module
                                if (!CheckDupe)
                                {
                                        // an autoconnected server is not connected. Check if its time to connect it
-                                       ServerInstance->WriteOpers("*** AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect);
+                                       ServerInstance->SNO->WriteToSnoMask('l',"AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect);
 
                                        insp_inaddr binip;
 
@@ -3993,7 +4058,7 @@ class ModuleSpanningTree : public Module
                                                }
                                                else
                                                {
-                                                       ServerInstance->WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
+                                                       ServerInstance->SNO->WriteToSnoMask('l',"AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
                                                        delete newsocket;
                                                }
                                        }
@@ -4073,7 +4138,7 @@ class ModuleSpanningTree : public Module
                                                }
                                                else
                                                {
-                                                       ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
+                                                       ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
                                                        delete newsocket;
                                                }
                                        }
@@ -4112,7 +4177,7 @@ class ModuleSpanningTree : public Module
                                results.push_back(std::string(ServerInstance->Config->ServerName)+" 244 "+user->nick+" H * * "+LinkBlocks[i].Name.c_str());
                        }
                        results.push_back(std::string(ServerInstance->Config->ServerName)+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
-                       ServerInstance->WriteOpers("*** Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
+                       ServerInstance->SNO->WriteToSnoMask('t',"Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
                        return 1;
                }
                return 0;
@@ -4136,6 +4201,10 @@ class ModuleSpanningTree : public Module
                {
                        return this->HandleMotd(parameters,pcnt,user);
                }
+               else if (command == "ADMIN")
+               {
+                       return this->HandleAdmin(parameters,pcnt,user);
+               }
                else if (command == "SQUIT")
                {
                        return this->HandleSquit(parameters,pcnt,user);