diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-24 22:41:43 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-24 22:41:43 +0000 |
| commit | 3487bfbd547efbdb6021f24b517c15ba08ee84db (patch) | |
| tree | 7f56b1cea38c4cc972015bb0cde0d022cd668afe /plugins/mod_tls.lua | |
| parent | e9210ce2e777ed966cc4e80df96582e84d0d2ae8 (diff) | |
| parent | 808ba7e691f4fbc36a380204ea4cce1c46d9b69b (diff) | |
| download | prosody-3487bfbd547efbdb6021f24b517c15ba08ee84db.tar.gz prosody-3487bfbd547efbdb6021f24b517c15ba08ee84db.zip | |
Merge 0.7->trunk
Diffstat (limited to 'plugins/mod_tls.lua')
| -rw-r--r-- | plugins/mod_tls.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index b30ad3f3..8b96aa15 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -10,6 +10,7 @@ local st = require "util.stanza"; 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 host = hosts[module.host]; 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; |