diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-04-22 19:03:50 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-04-22 19:03:50 +0100 |
| commit | ff37c604c8513abac725080be3333fa35719ab4e (patch) | |
| tree | f891319f71bbfa0e9d24bcef49604b606e2ea6ca /core | |
| parent | 67f1c12639abc5053bda02077abba5bf02ca0c2f (diff) | |
| parent | c8279932bfefb1bb8f5a251f59cdbd0230454335 (diff) | |
| download | prosody-ff37c604c8513abac725080be3333fa35719ab4e.tar.gz prosody-ff37c604c8513abac725080be3333fa35719ab4e.zip | |
Merge with Zash
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 2 |
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); |