prosody
edc63dc72566
plugins/mod_tls.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

plugins/mod_tls.lua @ 6487:edc63dc72566

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
parent 6302:76699a0ae4c4
child 6521:29c7586665f5
line wrap: on
line diff
--- 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");