# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1254751170 -3600
# Node ID 126401a7159f479e7dd558936c0d28a75ef0e974
# Parent  bfe120db1ec4e15f200d4b8017fa2f651d290419
require_encryption deprecated, use c2s_require_encryption instead

diff -r bfe120db1ec4 -r 126401a7159f plugins/mod_legacyauth.lua
--- a/plugins/mod_legacyauth.lua	Mon Oct 05 14:52:30 2009 +0100
+++ b/plugins/mod_legacyauth.lua	Mon Oct 05 14:59:30 2009 +0100
@@ -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 -r bfe120db1ec4 -r 126401a7159f plugins/mod_saslauth.lua
--- a/plugins/mod_saslauth.lua	Mon Oct 05 14:52:30 2009 +0100
+++ b/plugins/mod_saslauth.lua	Mon Oct 05 14:59:30 2009 +0100
@@ -25,7 +25,7 @@
 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 -r bfe120db1ec4 -r 126401a7159f plugins/mod_tls.lua
--- a/plugins/mod_tls.lua	Mon Oct 05 14:52:30 2009 +0100
+++ b/plugins/mod_tls.lua	Mon Oct 05 14:59:30 2009 +0100
@@ -11,7 +11,7 @@
 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,