From ce42de0c97134a0d521ed11ffa66cfce31ae6dc4 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Wed, 05 Mar 2008 12:42:55 +0000
Subject: [PATCH] Fix for issue #3005 (dsframework set-admin-user-properties does not work with the password of the administrator)
---
opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java
index 7f787f3..de2d34c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java
@@ -668,15 +668,15 @@
*
* @param propertySetArgument
* The input set argument.
- * @param checkMandatoryProps
+ * @param createCall
* Indicates if we should check the presence of mandatory
- * properties.
+ * properties and add root privileges.
* @return The created map.
* @throws ArgumentException
* If error error occurs during set parsing.
*/
private Map<AdministratorProperty, Object> mapSetOptionsToMap(
- StringArgument propertySetArgument, boolean checkMandatoryProps)
+ StringArgument propertySetArgument, boolean createCall)
throws ArgumentException
{
HashMap<AdministratorProperty, Object> map =
@@ -768,6 +768,14 @@
}
}
+ // If we are not in the create admin user, just return the
+ // provided atributes.
+ if (! createCall)
+ {
+ return map ;
+ }
+
+ // Here, we are in the create case.
// If privileges was not provided by the user, set the default value
if (! map.containsKey(AdministratorProperty.PRIVILEGE))
{
@@ -786,12 +794,6 @@
map.put(AdministratorProperty.PRIVILEGE,privilegesList);
}
- // Check that all mandatory props are set.
- if (! checkMandatoryProps)
- {
- return map ;
- }
-
for (AdministratorProperty s : AdministratorProperty.values())
{
Argument arg = userAdminProperties.get(s);
--
Gitblit v1.10.0