mod_legacyauth, mod_saslauth, mod_tls: Pass require_encryption as default option...

diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index 54cbec24c2c20a6fed1ef7b3147a446112ca33d3..5edc26bb2567604348e42d33b00854f4f24db921 100644 (file)
--- 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 9e63b4c7a9421e73a650ed97e6c7aab682a733f9..1cd944b0c3c07d3b98c3aa3664123deec737fa53 100644 (file)
--- 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 351aaffc9708ead631446118096334067e0a2f4d..f2d76c38e5c9b697f328aa7fb6f16ca99137661d 100644 (file)
--- 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");