diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-04-29 02:10:55 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-04-29 02:10:55 +0100 |
| commit | bd5f9b8cbfd168a21141607218446222ab9d8642 (patch) | |
| tree | e78baabff21e9b6fefaeef4a709098ca30b35922 /core/certmanager.lua | |
| parent | 9b89441dd008a8b3fda12d9217ff6f9ba240df9a (diff) | |
| parent | a2055895d362fed58ff314820bb7fddd53e40436 (diff) | |
| download | prosody-bd5f9b8cbfd168a21141607218446222ab9d8642.tar.gz prosody-bd5f9b8cbfd168a21141607218446222ab9d8642.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core/certmanager.lua')
| -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); |