diff options
| author | Kim Alvefur <zash@zash.se> | 2014-11-19 14:47:03 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-11-19 14:47:03 +0100 |
| commit | 9dc76115b1eb44714d202d91b4af11f9414b0ddd (patch) | |
| tree | 1f11feca6fbed53fc8c398b4403b621b5280ae72 /core | |
| parent | 47389e6d48107288b1489da9b253adad7a2bdb17 (diff) | |
| download | prosody-9dc76115b1eb44714d202d91b4af11f9414b0ddd.tar.gz prosody-9dc76115b1eb44714d202d91b4af11f9414b0ddd.zip | |
certmanager: Return final ssl config along with ssl context on success
Diffstat (limited to 'core')
| -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 837fe231..3454fcc4 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -137,8 +137,10 @@ function create_context(host, mode, ...) else log("error", "SSL/TLS: Error initialising for %s: %s", host, err); end + else + err = nil; end - return ctx, err; + return ctx, err or user_ssl_config; end function reload_ssl_config() |