diff options
author | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
commit | 983891c9fa8e728aa4680aedc74ec50a0329346e (patch) | |
tree | fc52870bbca26966e739b1654dd7ff728fbbd9e0 /util/openssl.lua | |
parent | 4adcfb2d185bb95ec430822c772f091b713faa7a (diff) | |
parent | 869da6c240dccfed8c43228ceb989af5faf6c8f1 (diff) | |
download | prosody-983891c9fa8e728aa4680aedc74ec50a0329346e.tar.gz prosody-983891c9fa8e728aa4680aedc74ec50a0329346e.zip |
Merge 0.9->trunk
Diffstat (limited to 'util/openssl.lua')
-rw-r--r-- | util/openssl.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util/openssl.lua b/util/openssl.lua index b3dc2943..0decb579 100644 --- a/util/openssl.lua +++ b/util/openssl.lua @@ -100,13 +100,13 @@ function ssl_config:from_prosody(hosts, config, certhosts) if name == certhost or name:sub(-1-#certhost) == "."..certhost then found_matching_hosts = true; self:add_dNSName(name); - --print(name .. "#component_module: " .. (config.get(name, "core", "component_module") or "nil")); - if config.get(name, "core", "component_module") == nil then + --print(name .. "#component_module: " .. (config.get(name, "component_module") or "nil")); + if config.get(name, "component_module") == nil then self:add_sRVName(name, "xmpp-client"); end - --print(name .. "#anonymous_login: " .. tostring(config.get(name, "core", "anonymous_login"))); - if not (config.get(name, "core", "anonymous_login") or - config.get(name, "core", "authentication") == "anonymous") then + --print(name .. "#anonymous_login: " .. tostring(config.get(name, "anonymous_login"))); + if not (config.get(name, "anonymous_login") or + config.get(name, "authentication") == "anonymous") then self:add_sRVName(name, "xmpp-server"); end self:add_xmppAddr(name); |