From ac43c71ec21ded1ae3a6ace3d9ce06995453e8ee Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 21 Oct 2014 12:49:03 +0200 Subject: mod_legacyauth, mod_saslauth, mod_tls: Pass require_encryption as default option to s2s_require_encryption so the later overrides the former --- plugins/mod_legacyauth.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/mod_legacyauth.lua') diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua index 54cbec24..5edc26bb 100644 --- a/plugins/mod_legacyauth.lua +++ b/plugins/mod_legacyauth.lua @@ -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"; -- cgit v1.2.3