Merge pull request #1169 from SaberUK/insp20+fix-makefile

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

diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index a04454f517d48d0022234c5cbdf2132040f8f153..d3033799e1a21d8d91990b51377bcf32cbd64871 100644 (file)
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -137,8 +137,9 @@ bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
                TreeServer* CheckDupe = Utils->FindServer(sname);
                if (CheckDupe)
                {
-                       this->SendError("Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!");
-                       ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
+                       std::string pname = CheckDupe->GetParent() ? CheckDupe->GetParent()->GetName() : "<ourself>";
+                       SendError("Server "+sname+" already exists on server "+pname+"!");
+                       ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+pname);
                        return false;
                }
                CheckDupe = Utils->FindServer(sid);
@@ -175,7 +176,7 @@ bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
                return true;
        }
 
-       this->SendError("Invalid credentials (check the other server's linking snomask for more information)");
+       this->SendError("Mismatched server name or password (check the other server's snomask output for details - e.g. umode +s +Ll)");
        ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, invalid link credentials");
        return false;
 }
@@ -275,7 +276,7 @@ bool TreeSocket::Inbound_Server(parameterlist &params)
                return true;
        }
 
-       this->SendError("Invalid credentials");
+       this->SendError("Mismatched server name or password (check the other server's snomask output for details - e.g. umode +s +Ll)");
        ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, invalid link credentials");
        return false;
 }