diff options
| author | Kim Alvefur <zash@zash.se> | 2017-01-23 19:34:14 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-01-23 19:34:14 +0100 |
| commit | 468d3db1a1eb87026d20303eeda6ff46d459df80 (patch) | |
| tree | ea895b1073f2ff2de7a08fc01f12797ab58c7125 /plugins/mod_tls.lua | |
| parent | 4c567124f67372cba0b688120eb726ab543b8bf1 (diff) | |
| parent | b54ba7235144f22208ce22ca31da705a62531935 (diff) | |
| download | prosody-468d3db1a1eb87026d20303eeda6ff46d459df80.tar.gz prosody-468d3db1a1eb87026d20303eeda6ff46d459df80.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_tls.lua')
| -rw-r--r-- | plugins/mod_tls.lua | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index 7eedb083..5869b2a5 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -124,9 +124,11 @@ module:hook_stanza("http://etherx.jabber.org/streams", "features", function (ses end, 500); module:hook_stanza(xmlns_starttls, "proceed", function (session, stanza) -- luacheck: ignore 212/stanza - module:log("debug", "Proceeding with TLS on s2sout..."); - session:reset_stream(); - session.conn:starttls(session.ssl_ctx); - session.secure = false; - return true; + if session.type == "s2sout_unauthed" and can_do_tls(session) then + module:log("debug", "Proceeding with TLS on s2sout..."); + session:reset_stream(); + session.conn:starttls(session.ssl_ctx); + session.secure = false; + return true; + end end); |