aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-07-14 16:24:15 +0100
committerMatthew Wild <mwild1@gmail.com>2010-07-14 16:24:15 +0100
commitb3416f9848cb623ba1fd2b998ce438dc930850cd (patch)
tree08e65ef91e57410f557c0dedda2671aca6c2bfdd
parent128f9755b781b40a175e47ce83a795cc7f7caf05 (diff)
downloadprosody-b3416f9848cb623ba1fd2b998ce438dc930850cd.tar.gz
prosody-b3416f9848cb623ba1fd2b998ce438dc930850cd.zip
certmanager: Fix to handle the case of no SSL configuration at all
-rw-r--r--core/certmanager.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 9b33bf72..6f0a1f59 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -23,9 +23,9 @@ local default_ssl_config = configmanager.get("*", "core", "ssl") or {};
local default_capath = "/etc/ssl/certs";
function create_context(host, mode, config)
- if not ssl then return nil; end
-
local user_ssl_config = config and config.core.ssl or default_ssl_config;
+
+ if not(ssl and user_ssl_config) then return nil; end
local ssl_config = {
mode = mode;