updates for new WS modifications

andrug

13.57.2007 30a01e1f73255ed52e1d0c3a1c87e156d64ef41a

updates for new WS modifications

 opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml

@@ -99,13 +99,11 @@
                    'DNToModify'             : 'cn=Access Control Handler,cn=config' ,
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global_aci ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: bypass-acl, DM searching entry'
                </message>
@@ -154,13 +152,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-bypass-acl' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: bypass-acl, DM searching entry'
                </message>
@@ -172,7 +168,9 @@
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'uid=scarter,ou=People,o=Privileges Tests,dc=example,dc=com' ,
                    'dsFilter'         : 'objectclass=*'  ,
                    'attributes'       : 'cn sn uid'}
                    'attributes'       : 'cn sn uid',
                    'expectedRC'       : 0
                  }
                </call>
    
                <script> 
@@ -200,13 +198,11 @@
                    'DNToModify'            : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'         : 'ds-privilege-name' ,
                    'newAttributeValue'     : '-bypass-acl' ,
                    'changetype'            : 'delete' }
                    'changetype'            : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: bypass-acl, DM searching entry'
                </message>
@@ -255,13 +251,11 @@
                    'DNToModify'             : 'cn=Access Control Handler,cn=config' ,
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global_aci ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
               <message>
                   'Privileges: Directory Manager: bypass-acl, DM searching entry'
                </message>
@@ -273,7 +267,9 @@
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'uid=scarter,ou=People,o=Privileges Tests,dc=example,dc=com' ,
                    'dsFilter'         : 'objectclass=*'  ,
                    'attributes'       : 'cn sn uid'}
                    'attributes'       : 'cn sn uid',
                    'expectedRC'             : 0
                  }
                </call>
    
                <script> 
@@ -328,13 +324,11 @@
                    'DNToModify'             : 'cn=Access Control Handler,cn=config' ,
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global_aci ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: bypass-acl, alternate bind DN, DM searching entry'
                </message>
@@ -346,7 +340,9 @@
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'uid=scarter,ou=People,o=Privileges Tests,dc=example,dc=com' ,
                    'dsFilter'         : 'objectclass=*'  ,
                    'attributes'       : 'cn sn uid'}
                    'attributes'       : 'cn sn uid',
                    'expectedRC'       : 0
                  }
                </call>
    
                <script> 
@@ -384,13 +380,10 @@
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-bypass-acl' ,
                    'changetype'             : 'add'  ,
                    'expectedErrorCode'      : '32' }
                    'expectedRC'             : 32
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager:  bypass-acl, alternate bind DN, alternate root user putting back global search ACI'
                </message>
@@ -403,13 +396,11 @@
                    'DNToModify'             : 'cn=Access Control Handler,cn=config' ,
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global_aci ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
               <message>
                   'Privileges: Directory Manager: bypass-acl, alternate bind DN, DM searching entry'
                </message>
@@ -421,7 +412,9 @@
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'uid=scarter,ou=People,o=Privileges Tests,dc=example,dc=com' ,
                    'dsFilter'         : 'objectclass=*'  ,
                    'attributes'       : 'cn sn uid'}
                    'attributes'       : 'cn sn uid',
                    'expectedRC'       : 0
                  }
                </call>
    
                <script> 
@@ -478,13 +471,11 @@
                    'DNToModify'             : 'ou=People, o=Privileges Tests, dc=example,dc=com' ,
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: modify-acl - add aci, alternate root user removing privilege'
                </message>
@@ -497,13 +488,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-modify-acl' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: modify-acl - add aci, DM adding ACI'
                </message>
@@ -521,13 +510,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search2_aci ,
                    'changetype'             : 'add' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: modify-acl - add aci, alternate root user putting back privilege'
                </message>
@@ -540,13 +526,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-modify-acl' ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: modify-acl - add aci, DM adding ACI'
                </message>
@@ -559,13 +543,11 @@
                    'DNToModify'             : 'ou=People, o=Privileges Tests, dc=example,dc=com' ,
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search2_aci ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: modify-acl - add aci, alternate root user deleting ACI'
                </message>
@@ -578,13 +560,11 @@
                    'DNToModify'             : 'ou=People, o=Privileges Tests, dc=example,dc=com' ,
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: modify-acl - add aci, alternate root user deleting ACI'
                </message>
@@ -648,13 +628,11 @@
                    'DNToModify'             : 'uid=tmorris, ou=People, o=Privileges Tests, dc=example,dc=com' ,
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'replace' }
                    'changetype'             : 'replace' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: modify-acl - replace aci, alternate root user removing privilege'
                </message>
@@ -667,13 +645,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-modify-acl' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: modify-acl - replace aci, DM replacing ACI'
                </message>
@@ -687,13 +663,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'replace' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: modify-acl - replace aci, alternate root user putting back privilege'
                </message>
@@ -706,13 +679,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-modify-acl' ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: modify-acl - replace aci, DM replacing ACI'
                </message>
@@ -775,13 +746,11 @@
                    'DNToModify'             : 'uid=gfarmer, ou=People, o=Privileges Tests, dc=example,dc=com' ,
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: modify-acl - delete aci, alternate root user removing privilege'
                </message>
@@ -794,13 +763,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-modify-acl' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: modify-acl - delete aci, DM delete ACI'
                </message>
@@ -818,13 +785,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search2_aci ,
                    'changetype'             : 'delete' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: modify-acl - delete aci, alternate root user putting back privilege'
                </message>
@@ -922,13 +886,11 @@
                    'DNToModify'            : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'         : 'ds-privilege-name' ,
                    'newAttributeValue'     : '-config-read' ,
                    'changetype'            : 'add' }
                    'changetype'            : 'add' ,
                    'expectedRC'            : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>

                <message>
                   'Privileges: Directory Manager: config-read, DM searching cn=config'
                </message>
@@ -941,13 +903,11 @@
                    'dsBaseDN'         : 'cn=config' ,
                    'dsFilter'         : 'objectclass=*'  ,
                    'attributes'       : 'ds-cfg-check-schema' ,
                    'extraParams'      : '-s base' }
                    'extraParams'      : '-s base' ,
                    'expectedRC'       : 50
                  }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: config-read, alternate root user putting back privilege'
                </message>
@@ -960,13 +920,11 @@
                    'DNToModify'            : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'         : 'ds-privilege-name' ,
                    'newAttributeValue'     : '-config-read' ,
                    'changetype'            : 'delete' }
                    'changetype'            : 'delete' ,
                    'expectedRC'            : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>

                <message>
                   'Privileges: Directory Manager: config-read, DM searching cn=config'
                </message>
@@ -1034,13 +992,11 @@
                    'DNToModify'             : 'cn=config' ,
                    'attributeName'          : 'ds-cfg-check-schema' ,
                    'newAttributeValue'      : 'true' ,
                    'changetype'             : 'replace' }
                    'changetype'             : 'replace' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>

                <message>
                   'Privileges: Directory Manager: config-write, alternate root user removing read privilege'
                </message>
@@ -1053,13 +1009,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-config-read' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: config-write, DM modifying cn=config'
                </message>
@@ -1073,13 +1027,10 @@
                    'attributeName'          : 'ds-cfg-check-schema' ,
                    'newAttributeValue'      : 'true' ,
                    'changetype'             : 'replace' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: config-write, alternate root user removing write privilege'
                </message>
@@ -1092,13 +1043,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-config-write' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: config-write, DM modifying cn=config'
                </message>
@@ -1112,13 +1061,10 @@
                    'attributeName'          : 'ds-cfg-check-schema' ,
                    'newAttributeValue'      : 'true' ,
                    'changetype'             : 'replace' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: config-write, alternate root user putting back read privilege'
                </message>
@@ -1131,13 +1077,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-config-read' ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: config-write, DM modifying cn=config'
                </message>
@@ -1151,13 +1095,10 @@
                    'attributeName'          : 'ds-cfg-check-schema' ,
                    'newAttributeValue'      : 'true' ,
                    'changetype'             : 'replace' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: config-write, alternate root user putting back write privilege'
                </message>
@@ -1170,13 +1111,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-config-write' ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: config-write, DM modifying cn=config'
                </message>
@@ -1245,13 +1184,11 @@
                    'DNToModify'             : 'cn=Access Control Handler,cn=config' ,
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global_aci ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: config-write - add global aci, alternate root user removing config-read privilege'
                </message>
@@ -1264,13 +1201,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-config-read' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: config-write - add global aci, DM adding ACI'
                </message>
@@ -1288,13 +1223,10 @@
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global2_aci ,
                    'changetype'             : 'add' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: config-write - add global aci, alternate user removing config-write privilege'
                </message>
@@ -1307,13 +1239,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-config-write' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: config-write - add global aci, alternate root user putting back config-read privilege'
                </message>
@@ -1326,13 +1256,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-config-read' ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: config-write - add global aci, DM  adding global ACI'
                </message>
@@ -1346,13 +1274,10 @@
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global2_aci ,
                    'changetype'             : 'add' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: config-write - add global aci, alternate root user putting back config-write privilege'
                </message>
@@ -1365,13 +1290,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-config-write' ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: config-write - add global aci, DM adding global ACI'
                </message>
@@ -1384,13 +1307,11 @@
                    'DNToModify'             : 'cn=Access Control Handler,cn=config' ,
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global2_aci ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: config-write - add global aci, alternate root user deleting write global ACI'
                </message>
@@ -1403,13 +1324,11 @@
                    'DNToModify'             : 'cn=Access Control Handler,cn=config' ,
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global_aci ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>

                <message>
                   'Privileges: Directory Manager: config-write - add global aci, alternate root user deleting write global ACI'
                </message>
@@ -1469,13 +1388,11 @@
                    'DNToModify'             : 'uid=tmason, ou=People, o=Privileges Tests, dc=example,dc=com' ,
                    'attributeName'          : 'userpassword' ,
                    'newAttributeValue'      : 'pickles' ,
                    'changetype'             : 'replace' }
                    'changetype'             : 'replace' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: password-reset, alternate root user removing privilege'
                </message>
@@ -1488,13 +1405,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-password-reset' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: password-reset, DM resetting password'
                </message>
@@ -1508,13 +1423,10 @@
                    'attributeName'          : 'userpassword' ,
                    'newAttributeValue'      : 'pickles' ,
                    'changetype'             : 'replace' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: password-reset, alternate root user putting back privilege'
                </message>
@@ -1527,13 +1439,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-password-reset' ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: password-reset, DM resetting password'
                </message>
@@ -1592,13 +1502,11 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : 'cn=Aroot' ,
                    'dsInstancePswd'   : 'PrivsRule' ,
                    'entryToBeAdded'   : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir }
                    'entryToBeAdded'   : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir ,
                    'expectedRC'       : 65
                  }
                </call>
    
                <if expr="RC != 65">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: update-schema, alternate root user removing privilege'
                </message>
@@ -1611,13 +1519,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-update-schema' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: update-schema, DM adding new schema object'
                </message>
@@ -1627,13 +1533,11 @@
                    'dsInstancePort'      : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'        : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD  ,
                    'entryToBeModified'   : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir }
                    'entryToBeModified'   : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir ,
                    'expectedRC'          : 50
                  }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: update-schema, alternate root user putting back privilege'
                </message>
@@ -1646,13 +1550,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-update-schema' ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: update-schema, DM adding new schema object'
                </message>
@@ -1662,13 +1564,11 @@
                    'dsInstancePort'      : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'        : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD  ,
                    'entryToBeModified'   : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir }
                    'entryToBeModified'   : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir ,
                    'expectedRC'          : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: update-schema, alternate root user adding entry that users new object class'
                </message>
@@ -1678,13 +1578,11 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : 'cn=Aroot' ,
                    'dsInstancePswd'   : 'PrivsRule' ,
                    'entryToBeAdded'   : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir }
                    'entryToBeAdded'   : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir ,
                    'expectedRC'       : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: update-schema, alternate root user searching entry'
                </message>
@@ -1763,13 +1661,11 @@
                    'DNToModify'             : 'dc=example,dc=com' ,
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : write_aci ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>

                <message>
                   'Privileges: Directory Manager: privilege-change, alternate root user removing privilege from DM'
                </message>
@@ -1782,13 +1678,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-privilege-change' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: privilege-change, DM adding privilege to second user'
                </message>
@@ -1802,13 +1696,10 @@
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : 'modify-acl' ,
                    'changetype'             : 'add' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Directory Manager: privilege-change, alternate root user putting back privilege to DM'
                </message>
@@ -1821,13 +1712,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-privilege-change' ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: privilege-change, DM adding privilege to second user'
                </message>
@@ -1840,13 +1729,11 @@
                    'DNToModify'             : 'uid=buser,o=Privileges Tests,dc=example,dc=com' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : 'modify-acl' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: privilege-change, second user adding ACI'
                </message>
@@ -1863,13 +1750,11 @@
                    'DNToModify'             : 'ou=People, o=Privileges Tests, dc=example,dc=com' ,
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>

                <message>
                   'Privileges: Directory Manager: privilege-change, DM removing privilege to second user'
                </message>
@@ -1882,13 +1767,11 @@
                    'DNToModify'             : 'uid=buser,o=Privileges Tests,dc=example,dc=com' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : 'modify-acl' ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: privilege-change, alternate root user deleting ACI'
                </message>
@@ -1901,13 +1784,11 @@
                    'DNToModify'             : 'ou=People, o=Privileges Tests, dc=example,dc=com' ,
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: privilege-change, alternate root user deleting write ACI'
                </message>
@@ -1969,13 +1850,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-server-shutdown' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: server-shutdown, user adding server shutdown task'
                </message>
@@ -2005,13 +1884,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-server-shutdown' ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: server-shutdown, user adding server shutdown task'
                </message>
@@ -2119,13 +1996,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-server-restart' ,
                    'changetype'             : 'add' }
                    'changetype'             : 'add' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: server-restart, DM adding server restart task'
                </message>
@@ -2155,13 +2030,11 @@
                    'DNToModify'             : 'cn=Directory Manager,cn=Root DNs,cn=config' ,
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-server-restart' ,
                    'changetype'             : 'delete' }
                    'changetype'             : 'delete' ,
                    'expectedRC'             : 0
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: server-restart, DM adding server restart task'
                </message>

 opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml

@@ -424,13 +424,10 @@
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : '-bypass-acl' ,
                    'changetype'             : 'add' ,
                    'expectedErrorCode'      : '32' }
                    'expectedRC'             : 32
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: New Root User:  bypass-acl, alternate bind DN, alternative root user putting back global search ACI'
                </message>
@@ -561,13 +558,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search2_aci ,
                    'changetype'             : 'add' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: New Root User: modify-acl - add aci, alternative root user putting back privilege'
                </message>
@@ -727,13 +721,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'replace' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: New Root User: modify-acl - replace aci, alternative root user putting back privilege'
                </message>
@@ -858,13 +849,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search2_aci ,
                    'changetype'             : 'delete' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: New Root User: modify-acl - delete aci, alternative root user putting back privilege'
                </message>
@@ -981,13 +969,11 @@
                    'dsBaseDN'         : 'cn=config' ,
                    'dsFilter'         : 'objectclass=*'  ,
                    'attributes'       : 'ds-cfg-check-schema' ,
                    'extraParams'      : '-s base' }
                    'extraParams'      : '-s base' ,
                    'expectedRC'       : 50
                  }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: New Root User: config-read, alternative root user putting back privilege'
                </message>
@@ -1113,13 +1099,10 @@
                    'attributeName'          : 'ds-cfg-check-schema' ,
                    'newAttributeValue'      : 'true' ,
                    'changetype'             : 'replace' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: New Root User: config-write, alternative root user removing privilege'
                </message>
@@ -1152,13 +1135,10 @@
                    'attributeName'          : 'ds-cfg-check-schema' ,
                    'newAttributeValue'      : 'true' ,
                    'changetype'             : 'replace' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: New Root User: config-write, altrnative root user putting back privilege'
                </message>
@@ -1191,13 +1171,10 @@
                    'attributeName'          : 'ds-cfg-check-schema' ,
                    'newAttributeValue'      : 'true' ,
                    'changetype'             : 'replace' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: New Root User: config-write, alternative root user putting back privilege'
                </message>
@@ -1328,13 +1305,10 @@
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global2_aci ,
                    'changetype'             : 'add' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: New Root User: config-write - add global aci, altrnative user removing config-write privilege'
                </message>
@@ -1386,13 +1360,10 @@
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global2_aci ,
                    'changetype'             : 'add' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: New Root User: config-write - add global aci, alternative root user putting back config-write privilege'
                </message>
@@ -1548,13 +1519,10 @@
                    'attributeName'          : 'userpassword' ,
                    'newAttributeValue'      : 'pickles' ,
                    'changetype'             : 'replace',
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: New Root User: password-reset, alternative root user deleting privilege'
                </message>
@@ -1632,13 +1600,11 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : 'cn=Aroot' ,
                    'dsInstancePswd'   : 'PrivsRule' ,
                    'entryToBeAdded'   : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir }
                    'entryToBeAdded'   : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir ,
                    'expectedRC'       : 65
                  }
                </call>
    
                <if expr="RC != 65">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: New Root User: update-schema, alternative root user removing privilege'
                </message>
@@ -1667,13 +1633,11 @@
                    'dsInstancePort'      : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'        : 'cn=Zroot' ,
                    'dsInstancePswd'      : 'PrivsRule' ,
                    'entryToBeModified'   : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir }
                    'entryToBeModified'   : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir ,
                    'expectedRC'          : 50
                  }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: New Root User: update-schema, alternative root user putting back privilege'
                </message>
@@ -1842,13 +1806,10 @@
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : 'modify-acl' ,
                    'changetype'             : 'add' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: New Root User: privilege-change, alternative root user putting back privilege to new root user'
                </message>

 opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml

@@ -151,13 +151,11 @@
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'dsBaseDN'         : 'uid=tmorris,ou=People,ou=restore task,o=Privileges Tests,dc=example,dc=com' ,
                    'dsFilter'         : 'objectclass=*'  ,
                    'attributes'       : 'cn sn uid'}
                    'attributes'       : 'cn sn uid',
                    'expectedRC'       : 32
                  }
                </call>
    
                <if expr="RC != 32">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Restore Tasks: backend-restore, Admin adding privilege'
                </message>
@@ -374,13 +372,11 @@
                    'dsInstancePswd'   : 'PrivsRule' ,
                    'dsBaseDN'         : 'uid=tmorris,ou=People,ou=restore task,o=Privileges Tests,dc=example,dc=com' ,
                    'dsFilter'         : 'objectclass=*'  ,
                    'attributes'       : 'cn sn uid'}
                    'attributes'       : 'cn sn uid',
                    'expectedRC'       : 32
                  }
                </call>
    
                <if expr="RC != 32">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Restore Tasks: backend-restore, Directory Manager, alternative root user removing privilege'
                </message>
@@ -591,13 +587,11 @@
                    'dsInstancePswd'   : 'PrivsRule' ,
                    'dsBaseDN'         : 'uid=tmorris,ou=People,ou=restore task,o=Privileges Tests,dc=example,dc=com' ,
                    'dsFilter'         : 'objectclass=*'  ,
                    'attributes'       : 'cn sn uid'}
                    'attributes'       : 'cn sn uid',
                    'expectedRC'       : 32
                  }
                </call>
    
                <if expr="RC != 32">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Restore Tasks: backend-restore, New User Root, alternative root user removing privilege'
                </message>

 opends/tests/functional-tests/testcases/privileges/privileges_users.xml

@@ -923,13 +923,10 @@
                    'attributeName'          : 'ds-privilege-name' ,
                    'newAttributeValue'      : 'bypass-acl' ,
                    'changetype'             : 'add' ,
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: bypass-acl self-modify add, user searching entry'
                </message>
@@ -1048,13 +1045,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'add' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: modify-acl - add aci, Admin adding privilege'
                </message>
@@ -1087,13 +1081,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'add' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: modify-acl - add aci, Admin adding write ACI'
                </message>
@@ -1172,13 +1163,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search2_aci ,
                    'changetype'             : 'add' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: modify-acl - add aci, Admin deleting write ACI'
                </message>
@@ -1234,7 +1222,8 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search3_aci ,
                    'changetype'             : 'add' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <call function="'checktestRC'">
@@ -1290,13 +1279,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'replace' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: modify-acl - replace aci, Admin adding write ACI'
                </message>
@@ -1333,13 +1319,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'replace' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: modify-acl - replace aci, Admin adding privilege'
                </message>
@@ -1410,13 +1393,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'replace' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: modify-acl - replace aci, Admin deleting privilege'
                </message>
@@ -1449,7 +1429,8 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : search_aci ,
                    'changetype'             : 'replace' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <call function="'checktestRC'">
@@ -1503,13 +1484,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : write_aci_dmiller ,
                    'changetype'             : 'delete' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: modify-acl - delete aci, Admin adding privilege'
                </message>
@@ -1542,13 +1520,10 @@
                    'attributeName'          : 'aci' ,
                    'newAttributeValue'      : write_aci_dmiller ,
                    'changetype'             : 'delete' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: modify-acl - delete aci, Admin adding write ACI'
                </message>
@@ -1670,13 +1645,11 @@
                    'dsBaseDN'         : 'cn=config' ,
                    'dsFilter'         : 'objectclass=*'  ,
                    'attributes'       : 'ds-cfg-check-schema' ,
                    'extraParams'      : '-s base' }
                    'extraParams'      : '-s base' ,
                    'expectedRC'       : 50
                  }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>

                <message>
                   'Privileges: Users: config-read, Admin adding privilege'
                </message>
@@ -1825,13 +1798,10 @@
                    'attributeName'          : 'ds-cfg-check-schema' ,
                    'newAttributeValue'      : 'true' ,
                    'changetype'             : 'replace' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: config-write, Admin adding privilege'
                </message>
@@ -1864,13 +1834,10 @@
                    'attributeName'          : 'ds-cfg-check-schema' ,
                    'newAttributeValue'      : 'true' ,
                    'changetype'             : 'replace' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: config-write, Admin adding privilege'
                </message>
@@ -1903,7 +1870,8 @@
                    'attributeName'          : 'ds-cfg-check-schema' ,
                    'newAttributeValue'      : 'true' ,
                    'changetype'             : 'replace' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
@@ -1984,13 +1952,10 @@
                    'attributeName'          : 'ds-cfg-check-schema' ,
                    'newAttributeValue'      : 'true' ,
                    'changetype'             : 'replace' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: config-write, Admin deleting privilege'
                </message>
@@ -2023,13 +1988,10 @@
                    'attributeName'          : 'ds-cfg-check-schema' ,
                    'newAttributeValue'      : 'true' ,
                    'changetype'             : 'replace' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: modify-acl - add aci, Admin deleting write ACI'
                </message>
@@ -2062,7 +2024,8 @@
                    'attributeName'          : 'ds-cfg-check-schema' ,
                    'newAttributeValue'      : 'true' ,
                    'changetype'             : 'replace' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <call function="'checktestRC'">
@@ -2123,13 +2086,10 @@
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global_aci ,
                    'changetype'             : 'add' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: config-write - add global aci, Admin adding privilege'
                </message>
@@ -2162,13 +2122,10 @@
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global_aci ,
                    'changetype'             : 'add' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: config-write - add global aci, Admin adding privilege'
                </message>
@@ -2201,13 +2158,10 @@
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global_aci ,
                    'changetype'             : 'add' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: config-write - add global aci, Admin adding write ACI'
                </message>
@@ -2286,13 +2240,10 @@
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global2_aci ,
                    'changetype'             : 'add' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: config-write - add global aci, Admin deleting privilege'
                </message>
@@ -2325,13 +2276,10 @@
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global2_aci ,
                    'changetype'             : 'add' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: config-write - add global aci, Admin deleting write ACI'
                </message>
@@ -2383,7 +2331,8 @@
                    'attributeName'          : 'ds-cfg-global-aci' ,
                    'newAttributeValue'      : global2_aci ,
                    'changetype'             : 'add' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <call function="'checktestRC'">
@@ -2457,13 +2406,10 @@
                    'attributeName'          : 'userpassword' ,
                    'newAttributeValue'      : 'bananas' ,
                    'changetype'             : 'replace' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: password-reset, Admin adding privilege'
                </message>
@@ -2570,7 +2516,8 @@
                    'attributeName'          : 'userpassword' ,
                    'newAttributeValue'      : 'bananas' ,
                    'changetype'             : 'replace' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <if expr="RC != 0">
@@ -2609,7 +2556,8 @@
                    'attributeName'          : 'userpassword' ,
                    'newAttributeValue'      : 'bananas' ,
                    'changetype'             : 'replace' , 
                    'expectedErrorCode'      : '50' }
                    'expectedRC'             : 50
                  }
                </call>
                
                <call function="'checktestRC'">
@@ -2679,13 +2627,11 @@
                    'dsInstancePort'      : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'        : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                    'dsInstancePswd'      : 'ACIRules'  ,
                    'entryToBeModified'   : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir }
                    'entryToBeModified'   : '%s/privileges/addmozobj.ldif' % logsRemoteDataDir ,
                    'expectedRC'          : 50
                  }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: update-schema, Admin adding entry that uses new object class'
                </message>
@@ -2695,13 +2641,11 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir }
                    'entryToBeAdded'   : '%s/privileges/add_entry_with_new_objclass.ldif' % logsRemoteDataDir ,
                    'expectedRC'       : 65
                  }
                </call>
    
                <if expr="RC != 65">
                    <tcstatus result="'fail'"/>
                </if>
    
                <message>
                   'Privileges: Users: update-schema, Admin adding privilege'
                </message>