From ab1a29b5a1cfeda2469f6ca4c3fa86094c83bc58 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Tue, 26 Mar 2013 13:22:14 +0000
Subject: [PATCH] CR-1472 Fix OPENDJ-823 Authz users forced to change their password shouldn't be able to modify entries

---
 opends/src/server/org/opends/server/core/DirectoryServer.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/DirectoryServer.java b/opends/src/server/org/opends/server/core/DirectoryServer.java
index 96418ed..c625d3b 100644
--- a/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -7296,7 +7296,10 @@
             }
           }
 
-          Message message = ERR_ENQUEUE_MUST_CHANGE_PASSWORD.get();
+          DN user = clientConnection.getAuthenticationInfo()
+              .getAuthorizationDN();
+          Message message = ERR_ENQUEUE_MUST_CHANGE_PASSWORD
+              .get(user != null ? user.toString() : "anonymous");
           throw new DirectoryException(
                   ResultCode.CONSTRAINT_VIOLATION, message);
 
@@ -7321,7 +7324,10 @@
               }
             }
 
-            message = ERR_ENQUEUE_MUST_CHANGE_PASSWORD.get();
+            user = clientConnection.getAuthenticationInfo()
+                .getAuthorizationDN();
+            message = ERR_ENQUEUE_MUST_CHANGE_PASSWORD
+                .get(user != null ? user.toString() : "anonymous");
             throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                          message);
           }

--
Gitblit v1.10.0