Bug 1228422 - adjust nsLDAPSecurityGlue for changes from bug 1200802. r=philip.chee
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Thu, 26 Nov 2015 21:56:54 +0200
changeset 23711 08660d66662e09b516fe02082d9d4ee1119a59bb
parent 23710 36242a48149d6aed19eed49e93368c88649f58c0
child 23712 e0ddca365d2c56545194f6647bf41f6b38c1268f
push id1564
push userclokep@gmail.com
push dateMon, 25 Jan 2016 18:47:24 +0000
treeherdercomm-beta@dec4b138be1d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilip.chee
bugs1228422, 1200802
Bug 1228422 - adjust nsLDAPSecurityGlue for changes from bug 1200802. r=philip.chee
ldap/xpcom/src/nsLDAPSecurityGlue.cpp
--- a/ldap/xpcom/src/nsLDAPSecurityGlue.cpp
+++ b/ldap/xpcom/src/nsLDAPSecurityGlue.cpp
@@ -169,17 +169,17 @@ nsLDAPSSLConnect(const char *hostlist, i
     // 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, 0, 0, socketInfo.soinfo_prfd,
+                                        nullptr, 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
     // some directory servers (notably the netscape 4.1 ds).  The only