From 580a63bc4576e5c6aa3a46064a0237eb3e92cdac Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 20 Dec 2010 17:12:16 +0000
Subject: [PATCH] Fix for OPENDJ-16 - Upgrade process fails to import additional RootDNs users. Make sure we allow pre-encoded passwords for internal ADD operations like it's done for MODIFY operations.
---
opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
index 60e5fc3..8214122 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
@@ -1107,7 +1107,8 @@
return;
}
- if ((!passwordPolicy.allowMultiplePasswordValues())
+ if ((!isInternalOperation())
+ && (!passwordPolicy.allowMultiplePasswordValues())
&& (passwordAttr.size() > 1))
{
// FIXME -- What if they're pre-encoded and might all be the
@@ -1132,7 +1133,8 @@
{
if (AuthPasswordSyntax.isEncoded(value))
{
- if (passwordPolicy.allowPreEncodedPasswords())
+ if (isInternalOperation() ||
+ passwordPolicy.allowPreEncodedPasswords())
{
builder.add(v);
continue;
@@ -1153,7 +1155,8 @@
{
if (UserPasswordSyntax.isEncoded(value))
{
- if (passwordPolicy.allowPreEncodedPasswords())
+ if (isInternalOperation() ||
+ passwordPolicy.allowPreEncodedPasswords())
{
builder.add(v);
continue;
--
Gitblit v1.10.0