aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-20 21:25:26 +0200
committerKim Alvefur <zash@zash.se>2014-04-20 21:25:26 +0200
commitaa3344731d2636073d39c3a2641d02813bd29019 (patch)
tree12b892b4278e9f419334b874a3628be550f1be90 /core
parentb9350a6264e1660077d2e5fedf87366329b4904b (diff)
downloadprosody-aa3344731d2636073d39c3a2641d02813bd29019.tar.gz
prosody-aa3344731d2636073d39c3a2641d02813bd29019.zip
certmanager: Fix traceback if no global 'ssl' section set (thanks albert)
Diffstat (limited to 'core')
-rw-r--r--core/certmanager.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 8f1e1520..ced17e58 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -111,7 +111,9 @@ function create_context(host, mode, user_ssl_config)
for option in pairs(set_options) do
local merged = {};
merge_set(core_defaults[option], merged);
- merge_set(global_ssl_config[option], merged);
+ if global_ssl_config then
+ merge_set(global_ssl_config[option], merged);
+ end
merge_set(user_ssl_config[option], merged);
local final_array = {};
for opt, enable in pairs(merged) do