diff options
| author | Kim Alvefur <zash@zash.se> | 2014-10-26 20:58:02 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-10-26 20:58:02 +0100 |
| commit | cebfb0bf3e29df5aac96cb0d41adb8e356921dc8 (patch) | |
| tree | 014c49281af8df716e5b9e9de87e1c6472f91dcc /plugins/mod_tls.lua | |
| parent | f08fe049ef978fdaa00132f238d6f038605ed3a1 (diff) | |
| parent | 8f2d2b9bea483c6a4cf1324af6306d60ae8d91b9 (diff) | |
| download | prosody-cebfb0bf3e29df5aac96cb0d41adb8e356921dc8.tar.gz prosody-cebfb0bf3e29df5aac96cb0d41adb8e356921dc8.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_tls.lua')
| -rw-r--r-- | plugins/mod_tls.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index 351aaffc..f2d76c38 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -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"); |