diff options
| author | Kim Alvefur <zash@zash.se> | 2014-04-20 21:25:26 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-04-20 21:25:26 +0200 |
| commit | 84ab9b78050508f04edaecdf502d111247ab1c75 (patch) | |
| tree | 12b892b4278e9f419334b874a3628be550f1be90 /core/certmanager.lua | |
| parent | be21fe5f3677f0431919357e330ab39991622606 (diff) | |
| download | prosody-84ab9b78050508f04edaecdf502d111247ab1c75.tar.gz prosody-84ab9b78050508f04edaecdf502d111247ab1c75.zip | |
certmanager: Fix traceback if no global 'ssl' section set (thanks albert)
Diffstat (limited to 'core/certmanager.lua')
| -rw-r--r-- | core/certmanager.lua | 4 |
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 |