Diff

plugins/s2s/mod_s2s.lua @ 4622:9eccb5a27989

Merge with Zash
author Matthew Wild <mwild1@gmail.com>
date Thu, 15 Mar 2012 03:19:35 +0000
parent 4620:e9dc6ae68c69
parent 4621:0445a543ae57
child 4625:325965bafae1
line wrap: on
line diff
--- 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;