From 1f026d8ca81a4cdadabb7a2aa126814add06073e Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Fri, 14 Dec 2007 09:51:02 +0000
Subject: [PATCH] Fix for issue #2648 (dsconfig/dsreplication do not work with ipv6 address): Before creating the ldapURL, check if we have an IPv6 address
---
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java | 2 +-
opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java | 2 +-
opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java | 2 +-
opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java | 4 +++-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java
index 80d1192..d704ca9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java
@@ -218,7 +218,7 @@
InitialLdapContext ctx = null;
// Get connection parameters
- host = getHostName();
+ host = ConnectionUtils.getHostNameForLdapUrl(getHostName());
port = getPort();
dn = getBindDN();
pwd = getBindPassword(dn, out, err);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
index 00ca737..8cd4c5b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
@@ -47,6 +47,7 @@
import javax.naming.ldap.LdapName;
import javax.naming.ldap.Rdn;
+import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.server.admin.client.AuthenticationException;
import org.opends.server.admin.client.AuthenticationNotSupportedException;
import org.opends.server.admin.client.CommunicationException;
@@ -101,7 +102,8 @@
env
.put(Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.ldap.LdapCtxFactory");
- env.put(Context.PROVIDER_URL, "ldap://" + host + ":" + port);
+ String hostname = ConnectionUtils.getHostNameForLdapUrl(host) ;
+ env.put(Context.PROVIDER_URL, "ldap://" + hostname + ":" + port);
env.put(Context.SECURITY_PRINCIPAL, name);
env.put(Context.SECURITY_CREDENTIALS, password);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
index 5be487c..52b7250 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
@@ -119,7 +119,7 @@
{
// Interact with the user though the console to get
// LDAP connection information
- String hostName = ci.getHostName();
+ String hostName = ConnectionUtils.getHostNameForLdapUrl(ci.getHostName());
Integer portNumber = ci.getPortNumber();
String bindDN = ci.getBindDN();
String bindPassword = ci.getBindPassword();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java b/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
index 20bb514..d0b65c2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
@@ -746,7 +746,7 @@
{
// Interact with the user though the console to get
// LDAP connection information
- String hostName = ci.getHostName();
+ String hostName = ConnectionUtils.getHostNameForLdapUrl(ci.getHostName());
Integer portNumber = ci.getPortNumber();
String bindDN = ci.getBindDN();
String bindPassword = ci.getBindPassword();
--
Gitblit v1.10.0