diff options
| author | Kim Alvefur <zash@zash.se> | 2014-10-21 12:49:03 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-10-21 12:49:03 +0200 |
| commit | fbd277b5c84d752c472348fd3527773ecffe3c48 (patch) | |
| tree | c1e24c4042660e03e73cb6d1f13dccd3bc1694da | |
| parent | a196567853d643591ea8b51f2b386ac836b0fc63 (diff) | |
| download | prosody-fbd277b5c84d752c472348fd3527773ecffe3c48.tar.gz prosody-fbd277b5c84d752c472348fd3527773ecffe3c48.zip | |
mod_legacyauth, mod_saslauth, mod_tls: Pass require_encryption as default option to s2s_require_encryption so the later overrides the former
| -rw-r--r-- | plugins/mod_legacyauth.lua | 4 | ||||
| -rw-r--r-- | plugins/mod_saslauth.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_tls.lua | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua index 54cbec24..5edc26bb 100644 --- a/plugins/mod_legacyauth.lua +++ b/plugins/mod_legacyauth.lua @@ -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"; diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 9e63b4c7..1cd944b0 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -16,7 +16,7 @@ local base64 = require "util.encodings".base64; 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; diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index 351aaffc..f2d76c38 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -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"); |