From 45a05a46b927f19865e6a748873d70efe9a99ac5 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 18:41:17 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
index 1c39d62..40bcc04 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
@@ -38,6 +38,7 @@
import org.forgerock.opendj.ldif.ConnectionEntryReader;
import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.browser.ConnectionWithControls;
import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
@@ -86,10 +87,10 @@
try
{
- ConnectionWrapper conn = controller.findConnectionForDisplayedEntry(node);
+ ConnectionWithControls conn = controller.findConnectionForDisplayedEntry(node);
if (conn != null && isBoundAs(dn, conn))
{
- currentPassword = conn.getBindPassword().toCharArray();
+ currentPassword = conn.getConnectionWrapper().getBindPassword().toCharArray();
}
}
catch (Throwable t)
@@ -225,16 +226,16 @@
* @param conn the connection that we are using to modify the password.
* @return {@code true} if we are bound using the provided entry.
*/
- private boolean isBoundAs(DN dn, ConnectionWrapper conn)
+ private boolean isBoundAs(DN dn, ConnectionWithControls conn)
{
- final DN bindDN = conn.getBindDn();
+ final DN bindDN = conn.getConnectionWrapper().getBindDn();
boolean isBoundAs = dn.equals(bindDN);
if (!isBoundAs)
{
String attrName = ATTR_ROOTDN_ALTERNATE_BIND_DN;
Filter filter = Filter.valueOf("(|(objectClass=*)(objectclass=ldapsubentry))");
SearchRequest request = newSearchRequest(dn, BASE_OBJECT, filter, attrName);
- try (ConnectionEntryReader entries = conn.getConnection().search(request))
+ try (ConnectionEntryReader entries = conn.search(request))
{
while (entries.hasNext())
{
--
Gitblit v1.10.0