aboutsummaryrefslogtreecommitdiffstats
path: root/core/certmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-11-20 15:01:47 +0100
committerKim Alvefur <zash@zash.se>2014-11-20 15:01:47 +0100
commitc69740e713d4ed2466cd55ea2cb137cb7334a7bf (patch)
tree1942217f4c99d9e88151d983acabdd514ac04386 /core/certmanager.lua
parent82dd57de00dd40bd2eace8089752e657fb577f23 (diff)
parentb32f290795cd6fa60cca8433399eec5fe561bbbc (diff)
downloadprosody-c69740e713d4ed2466cd55ea2cb137cb7334a7bf.tar.gz
prosody-c69740e713d4ed2466cd55ea2cb137cb7334a7bf.zip
Merge 0.10->trunk
Diffstat (limited to 'core/certmanager.lua')
-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()