diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:41:38 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:41:38 +0100 |
commit | da820882348572de470a13a1a50f529a51243aa5 (patch) | |
tree | 39ca42dddf3935546a0c3c37b2e2456a554899f1 /util/x509.lua | |
parent | 618661cda2a68afbe445ce079c15af25bdaa177b (diff) | |
parent | f7d4b04bf17c8b634eae00e814a995a88c5ba6cb (diff) | |
download | prosody-da820882348572de470a13a1a50f529a51243aa5.tar.gz prosody-da820882348572de470a13a1a50f529a51243aa5.zip |
Merge 0.9->0.10
Diffstat (limited to 'util/x509.lua')
-rw-r--r-- | util/x509.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/util/x509.lua b/util/x509.lua index 19d4ec6d..857f02a4 100644 --- a/util/x509.lua +++ b/util/x509.lua @@ -161,7 +161,9 @@ function verify_identity(host, service, cert) if sans[oid_xmppaddr] then had_supported_altnames = true - if compare_xmppaddr(host, sans[oid_xmppaddr]) then return true end + if service == "_xmpp-client" or service == "_xmpp-server" then + if compare_xmppaddr(host, sans[oid_xmppaddr]) then return true end + end end if sans[oid_dnssrv] then |