Merge 0.10->trunk

[prosody.git] / core / certmanager.lua

diff --git a/core/certmanager.lua b/core/certmanager.lua
index 3454fcc4e867081bf80cc752df9ea56bd4430798..7ad7b034a61df14b7370c7886656fe2ca51b4810 100644 (file)
--- 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()