aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-04-22 19:03:50 +0100
committerMatthew Wild <mwild1@gmail.com>2012-04-22 19:03:50 +0100
commit3aa4c851a6907975b6d833e295e11e0c4d1ebec2 (patch)
treef891319f71bbfa0e9d24bcef49604b606e2ea6ca
parentc1e2674fd4b5dd08abe07e9f3bbf92d34c096c56 (diff)
parente0762790fdb004d359450908dc8b94b3725daf74 (diff)
downloadprosody-3aa4c851a6907975b6d833e295e11e0c4d1ebec2.tar.gz
prosody-3aa4c851a6907975b6d833e295e11e0c4d1ebec2.zip
Merge with Zash
-rw-r--r--core/certmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 8b82ac47..cccf3098 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -35,7 +35,7 @@ function create_context(host, mode, user_ssl_config)
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);