Bug 1320111 - Port 1315143 to Mailnews. rs=bustage-fix a=jorgk
authorJorg K
Thu, 24 Nov 2016 20:45:32 +0100
changeset 26813 ea459696ff47f65f8f909bea4eaf5076e9d1182b
parent 26812 422cb090c018688a1df3c78312bed8a13af790f4
child 26814 04f21e45f23c196145ac9f41115725a6fb6edbd3
push id1834
push userclokep@gmail.com
push dateMon, 23 Jan 2017 21:48:40 +0000
treeherdercomm-beta@293cffe83e59 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix, jorgk
bugs1320111, 1315143
Bug 1320111 - Port 1315143 to Mailnews. rs=bustage-fix a=jorgk
ldap/xpcom/src/nsLDAPSecurityGlue.cpp
--- a/ldap/xpcom/src/nsLDAPSecurityGlue.cpp
+++ b/ldap/xpcom/src/nsLDAPSecurityGlue.cpp
@@ -169,18 +169,21 @@ nsLDAPSSLConnect(const char *hostlist, i
     // sessionClosure->hostname which was passed in separately to tell
     // AddToSocket what to match the name in the certificate against.
     // What exactly happen will happen when this is used with some IP
     // address in the list other than the first one is not entirely
     // clear, and I suspect it may depend on the format of the name in
     // the certificate.  Need to investigate.
     //
     rv = tlsSocketProvider->AddToSocket(PR_AF_INET,
-                                        sessionClosure->hostname, defport,
-                                        nullptr, EmptyCString(), 0,
+                                        sessionClosure->hostname,
+                                        defport,
+                                        nullptr,
+                                        mozilla::NeckoOriginAttributes(),
+                                        0,
                                         socketInfo.soinfo_prfd,
                                         getter_AddRefs(securityInfo));
     if (NS_FAILED(rv)) {
 	NS_ERROR("nsLDAPSSLConnect(): unable to add SSL layer to socket");
         goto close_socket_and_exit_with_error;
     }
 
     // If possible we want to avoid using SSLv2, as this can confuse