From d7c2353c5f18cd9445217fc2e8c08fdd25824e65 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Sun, 11 Oct 2026 15:40:11 +0000
Subject: [PATCH] Merge branch 'master' into vharseko-patch-1

---
 opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
index d69a014..5d2c77d 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
@@ -49,7 +49,6 @@
 import org.forgerock.opendj.ldap.AuthorizationException;
 import org.forgerock.opendj.ldap.ConnectionException;
 import org.forgerock.opendj.ldap.DN;
-import org.forgerock.opendj.ldap.RDN;
 
 /** This class provides utility functions for all the client side tools. */
 public final class Utils {
@@ -541,7 +540,7 @@
      * @return The DN of the administrator for the given UID.
      */
     public static DN getAdministratorDN(String uid) {
-        return DN.valueOf(RDN.valueOf("cn=" + uid) + ",cn=Administrators, cn=admin data");
+        return DN.valueOf("cn=Administrators,cn=admin data").child("cn", uid);
     }
 
     /**

--
Gitblit v1.10.0