[Merge to M73] Fix host comparison for XMPP cert verification special case
Fix the comparison that overrides the host for certificate verification
so it compares hostname <-> hostname
instead of hostname <-> hostname:port.
This is a follow-up to CL:1409303.
false, enroll the device for enterprise management and observe
no cert verification errors in the logs.
TBR=pmarko@chromium.org
(cherry picked from commit 415a9b3bfa494ee40b4c48fea7393741e670483b)
Bug: 941106
Test: manual: make TiclDeviceSettingsProvider::UseGCMChannel return
Change-Id: Id375f7ba8f4b140c28e1361f3496a6ee3f0fc8bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1520488
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#640409}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1526057
Reviewed-by: Pavol Marko <pmarko@chromium.org>
Cr-Commit-Position: refs/branch-heads/3683@{#844}
Cr-Branched-From: e51029943e0a38dd794b73caaf6373d5496ae783-refs/heads/master@{#625896}diff --git a/third_party/libjingle_xmpp/README.chromium b/third_party/libjingle_xmpp/README.chromium
index 5ae9ef2..23aaef4e 100644
--- a/third_party/libjingle_xmpp/README.chromium
+++ b/third_party/libjingle_xmpp/README.chromium
@@ -21,8 +21,4 @@
unused in Chromium, it's OK to delete it.
Local Modifications:
-* Include paths in third_party/libjingle_xmpp/xmllite,
- third_party/libjingle_xmpp/xmpp, and third_party/libjingle_xmpp/task_runner
- are updated to reflect the new absolute paths to their own and webrtc's
- headers.
-* disabled unstarted_task_test.DoNotDeleteTask2 under ASan
+This code does not exist in an upstream repo anymore.
diff --git a/third_party/libjingle_xmpp/xmpp/xmppclient.cc b/third_party/libjingle_xmpp/xmpp/xmppclient.cc
index 8a19078..de92055 100644
--- a/third_party/libjingle_xmpp/xmpp/xmppclient.cc
+++ b/third_party/libjingle_xmpp/xmpp/xmppclient.cc
@@ -111,7 +111,7 @@
// For other servers, we leave the strings empty, which causes the jid's
// domain to be used. We do the same for gmail.com and googlemail.com as the
// returned CN matches the account domain in those cases.
- std::string server_name = settings.server().ToString();
+ std::string server_name = settings.server().host();
if (server_name == jingle_xmpp::STR_TALK_GOOGLE_COM ||
server_name == jingle_xmpp::STR_TALKX_L_GOOGLE_COM ||
server_name == jingle_xmpp::STR_XMPP_GOOGLE_COM ||
