diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-03-28 12:17:15 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-03-28 12:17:15 +0000 |
| commit | 2bb354db7f21a35ddeb16cee161047919f944b71 (patch) | |
| tree | 3cea0291902a5fcdc82a59e5fe1747c4f8217900 /plugins/mod_s2s/s2sout.lib.lua | |
| parent | b47879e18077b22d5cbace5ed8bb7362ec087d33 (diff) | |
| parent | afbece2a947a2583a60daf6ec70259992c357e69 (diff) | |
| download | prosody-2bb354db7f21a35ddeb16cee161047919f944b71.tar.gz prosody-2bb354db7f21a35ddeb16cee161047919f944b71.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_s2s/s2sout.lib.lua')
| -rw-r--r-- | plugins/mod_s2s/s2sout.lib.lua | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua index 5ebbee8e..a22846db 100644 --- a/plugins/mod_s2s/s2sout.lib.lua +++ b/plugins/mod_s2s/s2sout.lib.lua @@ -90,7 +90,7 @@ function s2sout.attempt_connection(host_session, err) host_session.connecting = nil; if answer and #answer > 0 then log("debug", "%s has SRV records, handling...", to_host); - local srv_hosts = {}; + local srv_hosts = { answer = answer }; host_session.srv_hosts = srv_hosts; for _, record in ipairs(answer) do t_insert(srv_hosts, record.srv); @@ -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(); |