# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1413888543 -7200
# Node ID edc63dc7256688b05f02e374afdf37294e9837c0
# Parent  64146196b14287aa37e19058e98639d9144bfd4d
mod_legacyauth, mod_saslauth, mod_tls: Pass require_encryption as default option to s2s_require_encryption so the later overrides the former

diff -r 64146196b142 -r edc63dc72566 plugins/mod_legacyauth.lua
--- a/plugins/mod_legacyauth.lua	Tue Oct 21 12:47:53 2014 +0200
+++ b/plugins/mod_legacyauth.lua	Tue Oct 21 12:49:03 2014 +0200
@@ -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 -r 64146196b142 -r edc63dc72566 plugins/mod_saslauth.lua
--- a/plugins/mod_saslauth.lua	Tue Oct 21 12:47:53 2014 +0200
+++ b/plugins/mod_saslauth.lua	Tue Oct 21 12:49:03 2014 +0200
@@ -16,7 +16,7 @@
 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 -r 64146196b142 -r edc63dc72566 plugins/mod_tls.lua
--- a/plugins/mod_tls.lua	Tue Oct 21 12:47:53 2014 +0200
+++ b/plugins/mod_tls.lua	Tue Oct 21 12:49:03 2014 +0200
@@ -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");