From c3ddd7489abd06155b872cc23cef3575e2ee1b9a Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 08 Jan 2014 09:55:13 +0000
Subject: [PATCH] Align server types API with SDK types API
---
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
index 8a0ff12..d8d68c8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -409,7 +409,7 @@
return true;
}
- final RDN oldRDN = operation.getOriginalEntry().getDN().rdn();
+ final RDN oldRDN = operation.getOriginalEntry().getName().rdn();
final RDN newRDN = operation.getNewRDN();
final DN newSuperiorDN = operation.getNewSuperior();
@@ -502,7 +502,7 @@
final AuthenticationInfo authInfo =
new AuthenticationInfo(proxyUser, DirectoryServer.isRootDN(proxyUser
- .getDN()));
+ .getName()));
final AciContainer container =
new AciLDAPOperationContainer(op, proxiedUser, authInfo, ACI_PROXY);
return accessAllowedEntry(container);
@@ -810,7 +810,7 @@
throws DirectoryException
{
Entry resourceEntry = container.getResourceEntry();
- DN dn = resourceEntry.getDN();
+ DN dn = resourceEntry.getName();
List<Modification> modifications = operation.getModifications();
for (Modification m : modifications)
@@ -1473,7 +1473,7 @@
Privilege.MODIFY_ACL, operation))
{
Message message = INFO_ACI_ADD_FAILED_PRIVILEGE.get(
- String.valueOf(entry.getDN()), String.valueOf(clientDN));
+ String.valueOf(entry.getName()), String.valueOf(clientDN));
logError(message);
return false;
}
@@ -1485,12 +1485,12 @@
{
try
{
- Aci.decode(value.getValue(), entry.getDN());
+ Aci.decode(value.getValue(), entry.getName());
}
catch (AciException ex)
{
Message message = WARN_ACI_ADD_FAILED_DECODE.get(
- String.valueOf(entry.getDN()), ex.getMessage());
+ String.valueOf(entry.getName()), ex.getMessage());
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
--
Gitblit v1.10.0