From 09960e519cb96cf4bae82879e4dac1baced76336 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Tue, 03 Jun 2014 10:57:51 +0000
Subject: [PATCH] Fix OPENDJ-1427: Control-panel reports duplicate ds-sync-hist values for pwdHistory
---
opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java b/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
index 262a684..0621531 100644
--- a/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
+++ b/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.admin.ads.util;
@@ -54,6 +54,7 @@
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.TrustManager;
+import org.opends.server.replication.plugin.EntryHistorical;
import org.opends.server.schema.SchemaConstants;
/**
@@ -114,6 +115,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)
{
@@ -192,6 +195,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());
@@ -346,6 +351,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