From: Matthew Wild Date: Mon, 5 Oct 2009 13:59:30 +0000 (+0100) Subject: require_encryption deprecated, use c2s_require_encryption instead X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=4558eaa6e8e0c22c5519a746e930343b0f701f5a;p=prosody.git require_encryption deprecated, use c2s_require_encryption instead --- diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua index 4d0d7ca1..c678dce1 100644 --- 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 cbaaaa38..dc310e18 100644 --- 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 61b8d6d9..cce6e537 100644 --- 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,