From fd16c5b5a765bc36ff9281ed22bc90a93fad2995 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Mon, 16 Jun 2014 10:53:59 +0000
Subject: [PATCH] Forward port fix OPENDJ-1427: Control-panel reports duplicate ds-sync-hist values for pwdHistory
---
opendj3-server-dev/src/ads/org/opends/admin/ads/util/ConnectionUtils.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/opendj3-server-dev/src/ads/org/opends/admin/ads/util/ConnectionUtils.java b/opendj3-server-dev/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
index 15cdb39..072d4eb 100644
--- a/opendj3-server-dev/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
+++ b/opendj3-server-dev/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
@@ -55,6 +55,7 @@
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.TrustManager;
+import org.opends.server.replication.plugin.EntryHistorical;
import org.opends.server.schema.SchemaConstants;
/**
@@ -112,6 +113,8 @@
}
env.put(Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.ldap.LdapCtxFactory");
+ env.put("java.naming.ldap.attributes.binary",
+ EntryHistorical.HISTORICAL_ATTRIBUTE_NAME);
env.put(Context.PROVIDER_URL, ldapURL);
if (timeout >= 1)
{
@@ -190,6 +193,8 @@
}
env.put(Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.ldap.LdapCtxFactory");
+ env.put("java.naming.ldap.attributes.binary",
+ EntryHistorical.HISTORICAL_ATTRIBUTE_NAME);
env.put(Context.PROVIDER_URL, ldapsURL);
env.put("java.naming.ldap.factory.socket",
org.opends.admin.ads.util.TrustedSocketFactory.class.getName());
@@ -344,6 +349,8 @@
}
env.put(Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.ldap.LdapCtxFactory");
+ env.put("java.naming.ldap.attributes.binary",
+ EntryHistorical.HISTORICAL_ATTRIBUTE_NAME);
env.put(Context.PROVIDER_URL, ldapURL);
env.put(Context.SECURITY_AUTHENTICATION , "none");
--
Gitblit v1.10.0