prosody
7a5ddbaf758d
util/x509.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

util/x509.lua @ 6054:7a5ddbaf758d

Merge 0.9->0.10
author Matthew Wild <mwild1@gmail.com>
date Wed, 02 Apr 2014 17:41:38 +0100
parent 5845:c48f717c2fd6
child 6152:fbab74c28e31
comparison
equal deleted inserted replaced
6053:2f93a04564b2 6054:7a5ddbaf758d
159 -- SRV-ID, URI-ID, or any application-specific identifier types" 159 -- SRV-ID, URI-ID, or any application-specific identifier types"
160 local had_supported_altnames = false 160 local had_supported_altnames = false
161 161
162 if sans[oid_xmppaddr] then 162 if sans[oid_xmppaddr] then
163 had_supported_altnames = true 163 had_supported_altnames = true
164 if compare_xmppaddr(host, sans[oid_xmppaddr]) then return true end 164 if service == "_xmpp-client" or service == "_xmpp-server" then
165 if compare_xmppaddr(host, sans[oid_xmppaddr]) then return true end
166 end
165 end 167 end
166 168
167 if sans[oid_dnssrv] then 169 if sans[oid_dnssrv] then
168 had_supported_altnames = true 170 had_supported_altnames = true
169 -- Only check srvNames if the caller specified a service 171 -- Only check srvNames if the caller specified a service