Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge 0.6->0.7
Wed, 24 Mar 2010 22:34:59 +0000
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Wed, 24 Mar 2010 22:34:59 +0000
- changeset 2933
- e68ff49fa79b
- parent 2931
- de4daf300f19 (current diff)
- parent 2932
- d2816fb6c7ea (diff)
- child 2937
- 9380838a19dc
Merge 0.6->0.7
| plugins/mod_tls.lua | file | annotate | diff | comparison | revisions |
--- a/plugins/mod_tls.lua Tue Mar 23 20:55:28 2010 +0500 +++ b/plugins/mod_tls.lua Wed Mar 24 22:34:59 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;
