Mercurial > prosody-hg

comparison plugins/mod_tls.lua @ 6487:edc63dc72566

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mod_legacyauth, mod_saslauth, mod_tls: Pass require_encryption as default option to s2s_require_encryption so the later overrides the former
author Kim Alvefur <zash@zash.se>
date Tue, 21 Oct 2014 12:49:03 +0200
parents 76699a0ae4c4
children 29c7586665f5
comparison
equal deleted inserted replaced
6486:64146196b142 6487:edc63dc72566
7 -- 7 --
8 8
9 local create_context = require "core.certmanager".create_context; 9 local create_context = require "core.certmanager".create_context;
10 local st = require "util.stanza"; 10 local st = require "util.stanza";
11 11
12 local c2s_require_encryption = module:get_option("c2s_require_encryption") or module:get_option("require_encryption"); 12 local c2s_require_encryption = module:get_option("c2s_require_encryption", module:get_option("require_encryption"));
13 local s2s_require_encryption = module:get_option("s2s_require_encryption"); 13 local s2s_require_encryption = module:get_option("s2s_require_encryption");
14 local allow_s2s_tls = module:get_option("s2s_allow_encryption") ~= false; 14 local allow_s2s_tls = module:get_option("s2s_allow_encryption") ~= false;
15 local s2s_secure_auth = module:get_option("s2s_secure_auth"); 15 local s2s_secure_auth = module:get_option("s2s_secure_auth");
16 16
17 if s2s_secure_auth and s2s_require_encryption == false then 17 if s2s_secure_auth and s2s_require_encryption == false then