# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1378208429 -7200
# Node ID 6bc4077bc1f96ff83795fcc423ff270a28156d1c
# Parent  20e2b588f8c25e0d4996410fc2930c621599584f
certmanager: Fix dhparam callback, missing imports (Testing, pfft)

diff -r 20e2b588f8c2 -r 6bc4077bc1f9 core/certmanager.lua
--- a/core/certmanager.lua	Tue Sep 03 13:13:31 2013 +0200
+++ b/core/certmanager.lua	Tue Sep 03 13:40:29 2013 +0200
@@ -12,6 +12,8 @@
 local ssl_newcontext = ssl and ssl.newcontext;
 
 local tostring = tostring;
+local type = type;
+local io_open = io.open;
 
 local prosody = prosody;
 local resolve_path = configmanager.resolve_relative_path;
@@ -75,12 +77,12 @@
 	-- LuaSec expects dhparam to be a callback that takes two arguments.
 	-- We ignore those because it is mostly used for having a separate
 	-- set of params for EXPORT ciphers, which we don't have by default.
-	if type(user_ssl_config.dhparam) == "string" then
-		local f, err = io_open(resolve_path(user_ssl_config.dhparam));
+	if type(ssl_config.dhparam) == "string" then
+		local f, err = io_open(resolve_path(config_path, ssl_config.dhparam));
 		if not f then return nil, "Could not open DH parameters: "..err end
 		local dhparam = f:read("*a");
 		f:close();
-		user_ssl_config.dhparam = function() return dhparam; end
+		ssl_config.dhparam = function() return dhparam; end
 	end
 
 	local ctx, err = ssl_newcontext(ssl_config);