aboutsummaryrefslogtreecommitdiffstats
path: root/core/certmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-12-28 22:21:32 +0100
committerKim Alvefur <zash@zash.se>2017-12-28 22:21:32 +0100
commite6ada2cc8cac45d403590bb499c65a8b817f3658 (patch)
tree7cc066aaedb368e1647cbc9fc4c559a203cab40d /core/certmanager.lua
parent330a365ca80ee0a11a1b7a731e0801cff54e2704 (diff)
parentb8915c9db4fb03d17da7023b0e70b9872811785a (diff)
downloadprosody-e6ada2cc8cac45d403590bb499c65a8b817f3658.tar.gz
prosody-e6ada2cc8cac45d403590bb499c65a8b817f3658.zip
Merge 0.10->trunk
Diffstat (limited to 'core/certmanager.lua')
-rw-r--r--core/certmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index f343b6d7..1cbdac5d 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -176,8 +176,8 @@ local function create_context(host, mode, ...)
local user_ssl_config = cfg:final();
if mode == "server" then
- if not user_ssl_config.key then return nil, "No key present in SSL/TLS configuration for "..host; end
if not user_ssl_config.certificate then return nil, "No certificate present in SSL/TLS configuration for "..host; end
+ if not user_ssl_config.key then return nil, "No key present in SSL/TLS configuration for "..host; end
end
for option in pairs(path_options) do