# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1335117830 -3600
# Node ID 281596cc53d3540f9f984eec23e86eb62093944e
# Parent  9159546cb2f36d0447f0fd4dbf3229dfba09fe82# Parent  43469a2d124d8b76c436441f3dedf3f55dabfaaf
Merge with Zash

diff -r 9159546cb2f3 -r 281596cc53d3 core/certmanager.lua
--- a/core/certmanager.lua	Sun Apr 22 16:35:26 2012 +0100
+++ b/core/certmanager.lua	Sun Apr 22 19:03:50 2012 +0100
@@ -35,7 +35,7 @@
 		mode = mode;
 		protocol = user_ssl_config.protocol or "sslv23";
 		key = resolve_path(config_path, user_ssl_config.key);
-		password = user_ssl_config.password;
+		password = user_ssl_config.password or function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end;
 		certificate = resolve_path(config_path, user_ssl_config.certificate);
 		capath = resolve_path(config_path, user_ssl_config.capath or default_capath);
 		cafile = resolve_path(config_path, user_ssl_config.cafile);