aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-11-19 14:47:03 +0100
committerKim Alvefur <zash@zash.se>2014-11-19 14:47:03 +0100
commit843afaf3726f6201c3ba29ed0cf32cacb0e7900f (patch)
tree1f11feca6fbed53fc8c398b4403b621b5280ae72
parent8e786f387d9eaddc03d62fe534071486b56afed7 (diff)
downloadprosody-843afaf3726f6201c3ba29ed0cf32cacb0e7900f.tar.gz
prosody-843afaf3726f6201c3ba29ed0cf32cacb0e7900f.zip
certmanager: Return final ssl config along with ssl context on success
-rw-r--r--core/certmanager.lua4
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()