# HG changeset patch # User Kim Alvefur # Date 1389819435 -3600 # Node ID bd90250ee1eef82567416e3c4fb5ac997abfc596 # Parent 3f22f0de30f8178fb547cf456bbf9068f0b7ccec mod_tls: Rename variables to be less confusing diff -r 3f22f0de30f8 -r bd90250ee1ee plugins/mod_tls.lua --- a/plugins/mod_tls.lua Sun Jan 12 06:17:40 2014 -0500 +++ b/plugins/mod_tls.lua Wed Jan 15 21:57:15 2014 +0100 @@ -10,8 +10,8 @@ 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_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;