From: Kim Alvefur <zash@zash.se>
Date: Wed, 15 Jan 2014 20:57:15 +0000 (+0100)
Subject: mod_tls: Rename variables to be less confusing
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=8785dcd4bd1ee99ad5653c0deea83e9730c06400;hp=9db0f15f9672ea4c7b6c306bcb2422090f5a78f3;p=prosody.git

mod_tls: Rename variables to be less confusing
---

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;