From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java b/opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
index 7dee8d6..45296a1 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
@@ -29,7 +29,6 @@
import static org.opends.server.authorization.dseecompat.Aci.*;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.*;
import java.util.LinkedHashSet;
@@ -326,15 +325,15 @@
//Write right is more complicated. Create a dummy value and set that as
//the attribute's value. Call the special writeRightsString method, rather
//than rightsString.
- AttributeValue val=new AttributeValue(a, "dum###Val");
+ AttributeValue val= AttributeValues.create(a, "dum###Val");
container.setCurrentAttributeValue(val);
evalInfo.append(attributeLevelWriteRights(container, handler, skipCheck));
addAttrLevelRightsInfo(container, mask, a, retEntry, "write");
evalInfo.append(',');
//Perform both selfwrite_add and selfwrite_delete and append results.
- ByteString clientDNStr=
- new ASN1OctetString(container.getClientDN().toString());
- AttributeValue val1=new AttributeValue(a, clientDNStr);
+ AttributeValue val1=
+ AttributeValues.create(a,
+ container.getClientDN().toString());
if(!specificAttr)
container.setCurrentAttributeType(dnAttributeType);
container.setCurrentAttributeValue(val1);
--
Gitblit v1.10.0