diff options
| author | Kim Alvefur <zash@zash.se> | 2017-12-28 22:21:32 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-12-28 22:21:32 +0100 |
| commit | 616e9c23ac35944b13acb4e3ceed1627440acc86 (patch) | |
| tree | 7cc066aaedb368e1647cbc9fc4c559a203cab40d /core | |
| parent | e38223499f2f1b551f195d58ab632d985504e3d2 (diff) | |
| parent | fe36378134119cf06b5290ac8021ef39ea13ebab (diff) | |
| download | prosody-616e9c23ac35944b13acb4e3ceed1627440acc86.tar.gz prosody-616e9c23ac35944b13acb4e3ceed1627440acc86.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 2 |
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 |