aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-01-15 21:57:15 +0100
committerKim Alvefur <zash@zash.se>2014-01-15 21:57:15 +0100
commit573c5bea616fdfc648f51427a7f3731b3da01c24 (patch)
tree45e5038c1b502663803502d22991e6e0c6e2e6f3
parente81051a18113ed666594b4669cbdf2a22a3cc79a (diff)
downloadprosody-573c5bea616fdfc648f51427a7f3731b3da01c24.tar.gz
prosody-573c5bea616fdfc648f51427a7f3731b3da01c24.zip
mod_tls: Rename variables to be less confusing
-rw-r--r--plugins/mod_tls.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 54c69873..6db02c2c 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -10,8 +10,8 @@ local config = require "core.configmanager";
local create_context = require "core.certmanager".create_context;
local st = require "util.stanza";
-local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
-local secure_s2s_only = module:get_option("s2s_require_encryption");
+local c2s_require_encryption = module:get_option("c2s_require_encryption") or 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 xmlns_starttls = 'urn:ietf:params:xml:ns:xmpp-tls';
@@ -20,8 +20,8 @@ local starttls_proceed = st.stanza("proceed", starttls_attr);
local starttls_failure = st.stanza("failure", starttls_attr);
local c2s_feature = st.stanza("starttls", starttls_attr);
local s2s_feature = st.stanza("starttls", starttls_attr);
-if secure_auth_only then c2s_feature:tag("required"):up(); end
-if secure_s2s_only then s2s_feature:tag("required"):up(); end
+if c2s_require_encryption then c2s_feature:tag("required"):up(); end
+if s2s_require_encryption then s2s_feature:tag("required"):up(); end
local global_ssl_ctx = prosody.global_ssl_ctx;