From b3f4f5542fcbb2ec1b2e567da632bc854fefc67f Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Thu, 25 Jul 2013 15:34:19 +0000
Subject: [PATCH] Updated global search aci value after fix for OPENDJ-948
---
opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
index 95b7605..07028a4 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
@@ -54,9 +54,17 @@
# UPGRADE MODE
# Only for upgrade from 2.4.x
GLOBAL_ACI_SEARCH="(targetattr!=\"userPassword||authPassword||changes||changeNumber||changeType||changeTime||targetDN||newRDN||newSuperior||deleteOldRDN||targetEntryUUID||targetUniqueID||changeInitiatorsName||changeLogCookie\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"
+ elif UPGRADE_OPENDJNAME != '' and re.search('2.5.*',UPGRADE_OPENDJNAME) is not None:
+ # UPGRADE MODE
+ # Only for upgrade from 2.5.x
+ GLOBAL_ACI_SEARCH="(targetattr!=\"userPassword||authPassword||changes||changeNumber||changeType||changeTime||targetDN||newRDN||newSuperior||deleteOldRDN||targetEntryUUID||targetUniqueID||changeInitiatorsName||changeLogCookie\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"
+ elif UPGRADE_OPENDJNAME != '' and re.search('2.6.*',UPGRADE_OPENDJNAME) is not None:
+ # UPGRADE MODE
+ # Only for upgrade from 2.6.x
+ GLOBAL_ACI_SEARCH="(targetattr!=\"userPassword||authPassword||changes||changeNumber||changeType||changeTime||targetDN||newRDN||newSuperior||deleteOldRDN||targetEntryUUID||targetUniqueID||changeInitiatorsName||changeLogCookie\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"
else:
# NORMAL MODE
- GLOBAL_ACI_SEARCH="(targetattr!=\"userPassword||authPassword||changes||changeNumber||changeType||changeTime||targetDN||newRDN||newSuperior||deleteOldRDN||targetEntryUUID||changeInitiatorsName||changeLogCookie||includedAttributes\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"
+ GLOBAL_ACI_SEARCH="(targetattr!=\"userPassword||authPassword||changes||changeNumber||changeType||changeTime||debugsearchindex||targetDN||newRDN||newSuperior||deleteOldRDN||targetEntryUUID||changeInitiatorsName||changeLogCookie||includedAttributes\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"
</script>
<call function="'testGroup_Preamble'"/>
--
Gitblit v1.10.0