# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1331781575 0
# Node ID 9eccb5a279890d35c1b6ead717d93ea506a7a6fe
# Parent  e9dc6ae68c69ffa9ed171282ff4be1b67ba2cefe# Parent  0445a543ae57b387b08b8d5dc571dcdf2822030b
Merge with Zash

diff -r e9dc6ae68c69 -r 9eccb5a27989 plugins/s2s/mod_s2s.lua
--- a/plugins/s2s/mod_s2s.lua	Thu Mar 15 03:05:24 2012 +0000
+++ b/plugins/s2s/mod_s2s.lua	Thu Mar 15 03:19:35 2012 +0000
@@ -107,10 +107,7 @@
 	s2sout.initiate_connection(host_session);
 	if (not host_session.connecting) and (not host_session.conn) then
 		log("warn", "Connection to %s failed already, destroying session...", to_host);
-		if not s2s_destroy_session(host_session, "Connection failed") then
-			-- Already destroyed, we need to bounce our stanza
-			host_session:bounce_sendq(host_session.destruction_reason);
-		end
+		s2s_destroy_session(host_session, "Connection failed");
 		return false;
 	end
 	return true;