From: Kim Alvefur <zash@zash.se>
Date: Mon, 25 Mar 2013 18:08:15 +0000 (+0100)
Subject: mod_s2s: Reset secure flag on new connection attempt
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=b5c3ea3a716e59f7745d0dea734b44af0ac14757;p=prosody.git

mod_s2s: Reset secure flag on new connection attempt
---

diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua
index f89c5fc4..a22846db 100644
--- a/plugins/mod_s2s/s2sout.lib.lua
+++ b/plugins/mod_s2s/s2sout.lib.lua
@@ -271,6 +271,10 @@ function s2sout.make_connect(host_session, connect_host, connect_port)
 	
 	local from_host, to_host = host_session.from_host, host_session.to_host;
 	
+	-- Reset secure flag in case this is another
+	-- connection attempt after a failed STARTTLS
+	host_session.secure = nil;
+
 	local conn, handler;
 	if connect_host.proto == "IPv4" then
 		conn, handler = socket.tcp();