Split servers if they try to send infinite garbage without a newline

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

diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index b95ba79c3dff1aa3eee8b64a8ff8d2a36155ceeb..2f8854c6c20ca7cc79ed4e2fb40e878fc3f8d143 100644 (file)
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -53,9 +53,9 @@ void ServernameResolver::OnLookupComplete(const std::string &result, unsigned in
                else
                {
                        /* Something barfed, show the opers */
-                       ServerInstance->SNO->WriteToSnoMask('l', "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(), newsocket->getError().c_str());
                        ServerInstance->GlobalCulls.AddItem(newsocket);
-                       Utils->Creator->ConnectServer(myautoconnect);
                }
        }
 }
@@ -71,6 +71,6 @@ void ServernameResolver::OnError(ResolverError e, const std::string &errormessag
                return;
        }
        ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s", MyLink->Name.c_str(), errormessage.c_str() );
-       Utils->Creator->ConnectServer(myautoconnect);
+       Utils->Creator->ConnectServer(myautoconnect, false);
 }