prosody
c186b4883b8d%3A9380838a19dc
Software / code / prosody
Changeset
2937:9380838a19dc
Merge 0.7/waqas->0.7/MattJ
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 24 Mar 2010 22:40:53 +0000 |
| parents | 2933:e68ff49fa79b (diff) 2936:c186b4883b8d (current diff) |
| children | 2938:07f3b14d38d1 2939:dc73cbc69bd5 |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_tls.lua Wed Mar 24 00:07:17 2010 +0500 +++ b/plugins/mod_tls.lua Wed Mar 24 22:40:53 2010 +0000 @@ -10,6 +10,7 @@ local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption"); local secure_s2s_only = module:get_option("s2s_require_encryption"); +local allow_s2s_tls = module:get_option("s2s_allow_encryption") ~= false; local xmlns_starttls = 'urn:ietf:params:xml:ns:xmpp-tls'; local starttls_attr = { xmlns = xmlns_starttls }; @@ -27,9 +28,9 @@ local function can_do_tls(session) if session.type == "c2s_unauthed" then return session.conn.starttls and host.ssl_ctx_in; - elseif session.type == "s2sin_unauthed" then + elseif session.type == "s2sin_unauthed" and allow_s2s_tls then return session.conn.starttls and host.ssl_ctx_in; - elseif session.direction == "outgoing" then + elseif session.direction == "outgoing" and allow_s2s_tls then return session.conn.starttls and host.ssl_ctx; end return false;
