require_encryption deprecated, use c2s_require_encryption instead

diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index 4d0d7ca126f163947413399d1027a43bfc3f0340..c678dce1473a6a36bfa4e9bdfd4431ff5c8f8e3b 100644 (file)
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -11,7 +11,7 @@
 local st = require "util.stanza";
 local t_concat = table.concat;
 
-local secure_auth_only = module:get_option("require_encryption");
+local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
 
 local sessionmanager = require "core.sessionmanager";
 local usermanager = require "core.usermanager";

diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index cbaaaa389e0bdac5c9b04d35eb00346fa3ce6aec..dc310e1852b94b457e2263dc79bfb7186cf11a78 100644 (file)
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -25,7 +25,7 @@ local jid_split = require "util.jid".split
 local md5 = require "util.hashes".md5;
 local config = require "core.configmanager";
 
-local secure_auth_only = config.get(module:get_host(), "core", "require_encryption");
+local secure_auth_only = config.get(module:get_host(), "core", "c2s_require_encryption") or config.get(module:get_host(), "core", "require_encryption");
 
 local log = module._log;
 

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 61b8d6d96c5b771403cac771ad4185d67bb06f55..cce6e537629e66e7e979960df2ba50edd78423da 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -11,7 +11,7 @@ local st = require "util.stanza";
 local xmlns_stream = 'http://etherx.jabber.org/streams';
 local xmlns_starttls = 'urn:ietf:params:xml:ns:xmpp-tls';
 
-local secure_auth_only = module:get_option("require_encryption");
+local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
 local secure_s2s_only = module:get_option("require_s2s_encryption");
 
 module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,