aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/s2s/mod_s2s.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-03-15 03:19:35 +0000
committerMatthew Wild <mwild1@gmail.com>2012-03-15 03:19:35 +0000
commitf8822a2c63b98e8142b36462dedcfa4b948db416 (patch)
tree2770d22a689ae2988d52d3c41a165f92d8ad5757 /plugins/s2s/mod_s2s.lua
parent99096dfa23df0d6a7f01d2dcba500cd8330ac086 (diff)
parentc46d5d361b040b984882bb1917bcdc90d094ea94 (diff)
downloadprosody-f8822a2c63b98e8142b36462dedcfa4b948db416.tar.gz
prosody-f8822a2c63b98e8142b36462dedcfa4b948db416.zip
Merge with Zash
Diffstat (limited to 'plugins/s2s/mod_s2s.lua')
-rw-r--r--plugins/s2s/mod_s2s.lua5
1 files changed, 1 insertions, 4 deletions
diff --git a/plugins/s2s/mod_s2s.lua b/plugins/s2s/mod_s2s.lua
index 04b8ae04..ad7f4862 100644
--- a/plugins/s2s/mod_s2s.lua
+++ b/plugins/s2s/mod_s2s.lua
@@ -107,10 +107,7 @@ module:hook("route/remote", function (event)
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;