From 2910d03171f340abb463a9b914e1a8e984293498 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 31 Oct 2008 23:08:29 +0000
Subject: [PATCH] Fix for issue 3549 (Reset password in control panel does not work).
---
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java | 6 +++++-
opendj-sdk/opends/src/messages/messages/admin_tool.properties | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
index e837a59..13999d4 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
@@ -119,7 +119,7 @@
errors.add(ERR_CTRL_PANEL_NEW_PASSWORD_REQUIRED.get());
setPrimaryInvalid(lPassword);
}
- else if (pwd1.equals(pwd2))
+ else if (!pwd1.equals(pwd2))
{
errors.add(ERR_CTRL_PANEL_PASSWORD_DO_NOT_MATCH.get());
setPrimaryInvalid(lPassword);
@@ -201,6 +201,10 @@
{
labels[i] = Utilities.createPrimaryLabel(strings[i]);
}
+ else
+ {
+ labels[i].setText(strings[i].toString());
+ }
gbc.gridx = 0;
gbc.insets.left = 0;
diff --git a/opendj-sdk/opends/src/messages/messages/admin_tool.properties b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
index 843580e..d4199fa 100644
--- a/opendj-sdk/opends/src/messages/messages/admin_tool.properties
+++ b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
@@ -2091,7 +2091,7 @@
password.
INFO_CTRL_PANEL_RESET_USER_PASSWORD_TITLE=Reset User Password
INFO_CTRL_PANEL_RESET_USER_PASSWORD_DN_LABEL=DN:
-INFO_CTRL_PANEL_RESET_USER_PASSWORD_PWD_LABEL=Password:
+INFO_CTRL_PANEL_RESET_USER_PASSWORD_PWD_LABEL=New User Password:
INFO_CTRL_PANEL_RESET_USER_PASSWORD_CONFIRM_LABEL=Password (confirm):
INFO_CTRL_PANEL_RESET_USER_PASSWORD_NAME_LABEL=Name:
INFO_CTRL_PANEL_RESETTING_USER_PASSWORD_SUMMARY=Resetting user password...
--
Gitblit v1.10.0