From 6b91643447398f13e01a4e02f8431e5263fc9bff Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 20 Feb 2008 09:22:09 +0000
Subject: [PATCH] Fix for issue 2962 (Setup should allow non-secure replication port while LDAP access is SSL-enabled)
---
opends/src/quicksetup/org/opends/quicksetup/Application.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/Application.java b/opends/src/quicksetup/org/opends/quicksetup/Application.java
index a7b53b9..97e4923 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Application.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Application.java
@@ -34,6 +34,7 @@
import org.opends.admin.ads.ServerDescriptor;
import org.opends.admin.ads.TopologyCacheException;
import org.opends.admin.ads.util.ApplicationTrustManager;
+import org.opends.admin.ads.util.PreferredConnection;
import org.opends.admin.ads.util.ServerLoader;
import org.opends.quicksetup.event.ProgressNotifier;
import org.opends.quicksetup.event.ProgressUpdateListener;
@@ -50,6 +51,7 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -743,17 +745,20 @@
* connection.
* @param dn the dn to be used to authenticate.
* @param pwd the pwd to be used to authenticate.
+ * @param cnx the ordered list of preferred connections to connect to the
+ * server.
* @return the InitialLdapContext to the remote server.
* @throws ApplicationException if something goes wrong.
*/
protected InitialLdapContext getRemoteConnection(ServerDescriptor server,
- String dn, String pwd, ApplicationTrustManager trustManager)
+ String dn, String pwd, ApplicationTrustManager trustManager,
+ LinkedHashSet<PreferredConnection> cnx)
throws ApplicationException
{
Map<ADSContext.ServerProperty, Object> adsProperties =
server.getAdsProperties();
ServerLoader loader = new ServerLoader(adsProperties, dn, pwd,
- trustManager);
+ trustManager, cnx);
InitialLdapContext ctx = null;
try
--
Gitblit v1.10.0