From 2cf4acc0a786cfd040ec45e2b77db115a3672f66 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 03 Oct 2011 16:39:16 +0000
Subject: [PATCH] Fix OPENDJ-304: The result code 53 (unwillingToPerform) should only be used for service errors

---
 opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java b/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
index 3502229..4eb565a 100644
--- a/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
+++ b/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
@@ -813,7 +813,7 @@
           if (!pwPolicyState.getAuthenticationPolicy()
               .isAllowPreEncodedPasswords())
           {
-            operation.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
+            operation.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
 
             operation.appendErrorMessage(
                     ERR_EXTOP_PASSMOD_PRE_ENCODED_NOT_ALLOWED.get());
@@ -862,7 +862,7 @@
                                                        pwPolicyErrorType));
               }
 
-              operation.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
+              operation.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
 
               operation.appendErrorMessage(
                       ERR_EXTOP_PASSMOD_UNACCEPTABLE_PW.get(
@@ -880,7 +880,7 @@
               if (selfChange || (! pwPolicyState.getAuthenticationPolicy().
                                       isSkipValidationForAdministrators()))
               {
-                operation.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
+                operation.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
 
                 operation.appendErrorMessage(
                         ERR_EXTOP_PASSMOD_PW_IN_HISTORY.get());

--
Gitblit v1.10.0