From de057a2b2b34a914240d639da067dbae6e9a960b Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 5 Oct 2009 14:59:30 +0100
Subject: require_encryption deprecated, use c2s_require_encryption instead
---
plugins/mod_legacyauth.lua | 2 +-
plugins/mod_saslauth.lua | 2 +-
plugins/mod_tls.lua | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'plugins')
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,
--
cgit v1.2.3