Mercurial > prosody-hg

diff core/certmanager.lua @ 4797:e239668aa6d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 29 Apr 2012 02:10:55 +0100
parents 43469a2d124d
children a31ea431d906
line wrap: on
line diff
--- a/core/certmanager.lua	Sun Apr 29 02:09:12 2012 +0100
+++ b/core/certmanager.lua	Sun Apr 29 02:10:55 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);