Merge remote branch 'origin/mdb.master'

[openldap] / tests / data / memberof.out

diff --git a/tests/data/memberof.out b/tests/data/memberof.out
index 833df204af430c98aee5e7ba78dafaf5399536c4..32691bb33c6955e60e081eba17910804f05fd7d5 100644 (file)
--- a/tests/data/memberof.out
+++ b/tests/data/memberof.out
@@ -31,7 +31,7 @@ cn: Roger Rabbit
 sn: Rabbit
 memberOf: cn=Cartoonia,ou=Groups,dc=example,dc=com
 
-# Re-search the entire database...
+# Re-search the entire database after adding Jessica Rabbit and Cartoonia...
 dn: cn=Baby Herman,ou=People,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Baby Herman
@@ -71,21 +71,19 @@ cn: Roger Rabbit
 sn: Rabbit
 memberOf: cn=Cartoonia,ou=Groups,dc=example,dc=com
 
-# Re-search the entire database...
-dn: cn=Baby Herman,ou=People,dc=example,dc=com
+# Re-search the entire database after renaming Baby Herman...
+dn: cn=Baby Herman Jr,ou=People,dc=example,dc=com
 objectClass: inetOrgPerson
-cn: Baby Herman
 sn: Herman
 memberOf: cn=Cartoonia,ou=Groups,dc=example,dc=com
+cn: Baby Herman Jr
 
 dn: cn=Cartoonia,ou=Groups,dc=example,dc=com
 objectClass: groupOfNames
 cn: Cartoonia
 member: cn=Roger Rabbit,ou=People,dc=example,dc=com
-member: cn=Baby Herman,ou=People,dc=example,dc=com
 member: cn=Jessica Rabbit,ou=People,dc=example,dc=com
-member: cn=Cartoonia,ou=Groups,dc=example,dc=com
-memberOf: cn=Cartoonia,ou=Groups,dc=example,dc=com
+member: cn=Baby Herman Jr,ou=People,dc=example,dc=com
 
 dn: dc=example,dc=com
 objectClass: organization
@@ -113,14 +111,52 @@ cn: Roger Rabbit
 sn: Rabbit
 memberOf: cn=Cartoonia,ou=Groups,dc=example,dc=com
 
-# Re-search the entire database...
-dn: cn=Cartoonia,ou=Groups,dc=example,dc=com
+# Re-search the entire database after renaming Cartoonia...
+dn: cn=Baby Herman Jr,ou=People,dc=example,dc=com
+objectClass: inetOrgPerson
+sn: Herman
+memberOf: cn=Toon Town,ou=Groups,dc=example,dc=com
+cn: Baby Herman Jr
+
+dn: dc=example,dc=com
+objectClass: organization
+objectClass: dcObject
+o: Example, Inc.
+dc: example
+
+dn: ou=Groups,dc=example,dc=com
+objectClass: organizationalUnit
+ou: Groups
+
+dn: cn=Jessica Rabbit,ou=People,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Jessica Rabbit
+sn: Rabbit
+memberOf: cn=Toon Town,ou=Groups,dc=example,dc=com
+
+dn: ou=People,dc=example,dc=com
+objectClass: organizationalUnit
+ou: People
+
+dn: cn=Roger Rabbit,ou=People,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Roger Rabbit
+sn: Rabbit
+memberOf: cn=Toon Town,ou=Groups,dc=example,dc=com
+
+dn: cn=Toon Town,ou=Groups,dc=example,dc=com
 objectClass: groupOfNames
-cn: Cartoonia
 member: cn=Roger Rabbit,ou=People,dc=example,dc=com
 member: cn=Jessica Rabbit,ou=People,dc=example,dc=com
-member: cn=Cartoonia,ou=Groups,dc=example,dc=com
-memberOf: cn=Cartoonia,ou=Groups,dc=example,dc=com
+member: cn=Baby Herman Jr,ou=People,dc=example,dc=com
+cn: Toon Town
+
+# Re-search the entire database after adding Toon Town to self...
+dn: cn=Baby Herman Jr,ou=People,dc=example,dc=com
+objectClass: inetOrgPerson
+sn: Herman
+memberOf: cn=Toon Town,ou=Groups,dc=example,dc=com
+cn: Baby Herman Jr
 
 dn: dc=example,dc=com
 objectClass: organization
@@ -136,7 +172,77 @@ dn: cn=Jessica Rabbit,ou=People,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Jessica Rabbit
 sn: Rabbit
-memberOf: cn=Cartoonia,ou=Groups,dc=example,dc=com
+memberOf: cn=Toon Town,ou=Groups,dc=example,dc=com
+
+dn: ou=People,dc=example,dc=com
+objectClass: organizationalUnit
+ou: People
+
+dn: cn=Roger Rabbit,ou=People,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Roger Rabbit
+sn: Rabbit
+memberOf: cn=Toon Town,ou=Groups,dc=example,dc=com
+
+dn: cn=Toon Town,ou=Groups,dc=example,dc=com
+objectClass: groupOfNames
+member: cn=Roger Rabbit,ou=People,dc=example,dc=com
+member: cn=Jessica Rabbit,ou=People,dc=example,dc=com
+member: cn=Baby Herman Jr,ou=People,dc=example,dc=com
+member: cn=Toon Town,ou=Groups,dc=example,dc=com
+cn: Toon Town
+memberOf: cn=Toon Town,ou=Groups,dc=example,dc=com
+
+# Re-search the entire database after deleting Baby Herman...
+dn: dc=example,dc=com
+objectClass: organization
+objectClass: dcObject
+o: Example, Inc.
+dc: example
+
+dn: ou=Groups,dc=example,dc=com
+objectClass: organizationalUnit
+ou: Groups
+
+dn: cn=Jessica Rabbit,ou=People,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Jessica Rabbit
+sn: Rabbit
+memberOf: cn=Toon Town,ou=Groups,dc=example,dc=com
+
+dn: ou=People,dc=example,dc=com
+objectClass: organizationalUnit
+ou: People
+
+dn: cn=Roger Rabbit,ou=People,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Roger Rabbit
+sn: Rabbit
+memberOf: cn=Toon Town,ou=Groups,dc=example,dc=com
+
+dn: cn=Toon Town,ou=Groups,dc=example,dc=com
+objectClass: groupOfNames
+member: cn=Roger Rabbit,ou=People,dc=example,dc=com
+member: cn=Jessica Rabbit,ou=People,dc=example,dc=com
+member: cn=Toon Town,ou=Groups,dc=example,dc=com
+cn: Toon Town
+memberOf: cn=Toon Town,ou=Groups,dc=example,dc=com
+
+# Re-search the entire database after deleting Toon Town...
+dn: dc=example,dc=com
+objectClass: organization
+objectClass: dcObject
+o: Example, Inc.
+dc: example
+
+dn: ou=Groups,dc=example,dc=com
+objectClass: organizationalUnit
+ou: Groups
+
+dn: cn=Jessica Rabbit,ou=People,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Jessica Rabbit
+sn: Rabbit
 
 dn: ou=People,dc=example,dc=com
 objectClass: organizationalUnit
@@ -146,9 +252,8 @@ dn: cn=Roger Rabbit,ou=People,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Roger Rabbit
 sn: Rabbit
-memberOf: cn=Cartoonia,ou=Groups,dc=example,dc=com
 
-# Re-search the entire database...
+# Re-search the entire database after adding groups with MAY member type schemas...
 dn: dc=example,dc=com
 objectClass: organization
 objectClass: dcObject