From 6748a78dd685559342f027f9890c2e81931624f4 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Thu, 13 Sep 2007 20:00:57 +0000
Subject: [PATCH] These changes allow dsconfig to decode the ACI string similar to what is done for the DN syntax attributes. A new <adm: aci /> syntax has been created that DSEE compat configuration handler is now using.
---
opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java b/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
index 6d76f6f..b7fa1c6 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -231,26 +231,12 @@
private void processGlobalAcis(
DseeCompatAccessControlHandlerCfg configuration)
throws InitializationException {
- LinkedList<Message>failedACIMsgs=new LinkedList<Message>();
- SortedSet<String> globalAci = configuration.getGlobalACI();
+ SortedSet<Aci> globalAcis = configuration.getGlobalACI();
try {
- if (globalAci != null) {
- LinkedHashSet<AttributeValue> attVals =
- new LinkedHashSet<AttributeValue>(globalAci.size());
- for (String aci : globalAci)
- {
- attVals.add(new AttributeValue(globalAciType,aci));
- }
- Attribute attr = new Attribute(globalAciType,
- globalAciType.toString(),
- attVals);
- Entry e = new Entry(configuration.dn(), null, null, null);
- e.addAttribute(attr, new ArrayList<AttributeValue>());
- int aciCount = aciList.addAci(e, false, true, failedACIMsgs);
- if(!failedACIMsgs.isEmpty())
- aciListenerMgr.logMsgsSetLockDownMode(failedACIMsgs);
+ if (globalAcis != null) {
+ aciList.addAci(DN.nullDN(),globalAcis);
Message message = INFO_ACI_ADD_LIST_GLOBAL_ACIS.get(
- Integer.toString(aciCount));
+ Integer.toString(globalAcis.size()));
logError(message);
} else {
Message message = INFO_ACI_ADD_LIST_NO_GLOBAL_ACIS.get();
--
Gitblit v1.10.0