prosody
c6caaa440e74
core/certmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

core/certmanager.lua @ 6520:c6caaa440e74

certmanager: Return final ssl config along with ssl context on success
author Kim Alvefur <zash@zash.se>
date Wed, 19 Nov 2014 14:47:03 +0100
parent 6501:71b6e8b48a12
child 6526:873538f0b18c
line wrap: on
line diff
--- a/core/certmanager.lua	Wed Nov 19 14:45:20 2014 +0100
+++ b/core/certmanager.lua	Wed Nov 19 14:47:03 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()