aboutsummaryrefslogtreecommitdiffstats
path: root/core/certmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-11-22 11:53:14 +0100
committerKim Alvefur <zash@zash.se>2014-11-22 11:53:14 +0100
commitac568342e55017173a1751565ba4ab18f7f0e11e (patch)
tree98623423e23c23564e823ff65f6b5bca51f14de2 /core/certmanager.lua
parentc69740e713d4ed2466cd55ea2cb137cb7334a7bf (diff)
parenta5fc6e29d9e9518715972d20c11d89d7a1434648 (diff)
downloadprosody-ac568342e55017173a1751565ba4ab18f7f0e11e.tar.gz
prosody-ac568342e55017173a1751565ba4ab18f7f0e11e.zip
Merge 0.10->trunk
Diffstat (limited to 'core/certmanager.lua')
-rw-r--r--core/certmanager.lua4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 3454fcc4..7ad7b034 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -137,10 +137,8 @@ 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 or user_ssl_config;
+ return ctx, err, user_ssl_config;
end
function reload_ssl_config()