diff options
| author | Kim Alvefur <zash@zash.se> | 2014-11-22 11:51:54 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-11-22 11:51:54 +0100 |
| commit | a5fc6e29d9e9518715972d20c11d89d7a1434648 (patch) | |
| tree | a107c6b235bdc0c90990a566f221a810ea3ffc9b /core | |
| parent | b32f290795cd6fa60cca8433399eec5fe561bbbc (diff) | |
| download | prosody-a5fc6e29d9e9518715972d20c11d89d7a1434648.tar.gz prosody-a5fc6e29d9e9518715972d20c11d89d7a1434648.zip | |
certmanager, mod_tls: Return final ssl config as third return value (fix for c6caaa440e74, portmanager assumes non-falsy second return value is an error) (thanks deoren)
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 3454fcc4..7ad7b034 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -137,10 +137,8 @@ function create_context(host, mode, ...) else log("error", "SSL/TLS: Error initialising for %s: %s", host, err); end - else - err = nil; end - return ctx, err or user_ssl_config; + return ctx, err, user_ssl_config; end function reload_ssl_config() |