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 | 763567fa0236b0b80e0271ed1d3325501b979ee1 (patch) | |
| tree | 014c49281af8df716e5b9e9de87e1c6472f91dcc /plugins/mod_tls.lua | |
| parent | ff41d8ed2af5324b8f439a6864e41505ab778080 (diff) | |
| parent | 29326acffa1d582bed7759e6302d2c4b4bced884 (diff) | |
| download | prosody-763567fa0236b0b80e0271ed1d3325501b979ee1.tar.gz prosody-763567fa0236b0b80e0271ed1d3325501b979ee1.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"); |