From 5ed6190be19e19704775aa93ea4f4d1f6397219f Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 27 Jul 2016 12:07:23 +0000
Subject: [PATCH] ConnectionUtils.java: In createLdapContext(), match what ConnectionWrapper.toOptions() is doing

---
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
index 49feb14..1a671d4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
@@ -98,12 +98,9 @@
     {
       env.put("com.sun.jndi.ldap.connect.timeout", String.valueOf(timeout));
     }
-    if (dn != null)
+    if (dn != null && pwd != null)
     {
       env.put(Context.SECURITY_PRINCIPAL, dn);
-    }
-    if (pwd != null)
-    {
       env.put(Context.SECURITY_CREDENTIALS, pwd);
     }
 

--
Gitblit v1.10.0