Mercurial > prosody-hg

diff core/certmanager.lua @ 6525:7c273da3cff6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 20 Nov 2014 15:01:47 +0100
parents c6caaa440e74
children 873538f0b18c
line wrap: on
line diff
--- a/core/certmanager.lua	Thu Nov 20 09:02:23 2014 +0000
+++ b/core/certmanager.lua	Thu Nov 20 15:01:47 2014 +0100
@@ -137,8 +137,10 @@
 		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()