Software / code / prosody
Changeset
6487:edc63dc72566
mod_legacyauth, mod_saslauth, mod_tls: Pass require_encryption as default option to s2s_require_encryption so the later overrides the former
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 21 Oct 2014 12:49:03 +0200 |
| parents | 6486:64146196b142 |
| children | 6488:c91193b7e72c |
| files | plugins/mod_legacyauth.lua plugins/mod_saslauth.lua plugins/mod_tls.lua |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_legacyauth.lua Tue Oct 21 12:47:53 2014 +0200 +++ b/plugins/mod_legacyauth.lua Tue Oct 21 12:49:03 2014 +0200 @@ -11,8 +11,8 @@ local st = require "util.stanza"; local t_concat = table.concat; -local secure_auth_only = module:get_option("c2s_require_encryption") - or module:get_option("require_encryption") +local secure_auth_only = module:get_option("c2s_require_encryption", + module:get_option("require_encryption")) or not(module:get_option("allow_unencrypted_plain_auth")); local sessionmanager = require "core.sessionmanager";
--- a/plugins/mod_saslauth.lua Tue Oct 21 12:47:53 2014 +0200 +++ b/plugins/mod_saslauth.lua Tue Oct 21 12:49:03 2014 +0200 @@ -16,7 +16,7 @@ local usermanager_get_sasl_handler = require "core.usermanager".get_sasl_handler; local tostring = tostring; -local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption"); +local secure_auth_only = module:get_option("c2s_require_encryption", module:get_option("require_encryption")); local allow_unencrypted_plain_auth = module:get_option("allow_unencrypted_plain_auth") local log = module._log;
--- a/plugins/mod_tls.lua Tue Oct 21 12:47:53 2014 +0200 +++ b/plugins/mod_tls.lua Tue Oct 21 12:49:03 2014 +0200 @@ -9,7 +9,7 @@ local create_context = require "core.certmanager".create_context; local st = require "util.stanza"; -local c2s_require_encryption = module:get_option("c2s_require_encryption") or module:get_option("require_encryption"); +local c2s_require_encryption = module:get_option("c2s_require_encryption", module:get_option("require_encryption")); local s2s_require_encryption = module:get_option("s2s_require_encryption"); local allow_s2s_tls = module:get_option("s2s_allow_encryption") ~= false; local s2s_secure_auth = module:get_option("s2s_secure_auth");
