ITS#9121 - Use memberOf instead of dgMemberOf

diff --git a/tests/data/dynlist.out b/tests/data/dynlist.out
index 168cc57a1cc9c7029532af0a2d6beb96622fff1f..a5374c366bfba2df6e78e4dfdc528ebbdec45ac0 100644 (file)
--- a/tests/data/dynlist.out
+++ b/tests/data/dynlist.out
@@ -344,7 +344,7 @@ mail: melliot@mail.alumni.example.com
 pager: +1 313 555 7671
 facsimileTelephoneNumber: +1 313 555 7762
 telephoneNumber: +1 313 555 4177
-dgMemberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
 
 # Testing filtered memberOf functionality...
 dn: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com
@@ -363,7 +363,7 @@ mail: melliot@mail.alumni.example.com
 pager: +1 313 555 7671
 facsimileTelephoneNumber: +1 313 555 7762
 telephoneNumber: +1 313 555 4177
-dgMemberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
 
 # Testing static group memberOf functionality...
 dn: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com
@@ -382,9 +382,9 @@ mail: melliot@mail.alumni.example.com
 pager: +1 313 555 7671
 facsimileTelephoneNumber: +1 313 555 7762
 telephoneNumber: +1 313 555 4177
-dgMemberOf: cn=all staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=alumni assoc staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=all staff,ou=groups,dc=example,dc=com
+memberOf: cn=alumni assoc staff,ou=groups,dc=example,dc=com
+memberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
 
 # Testing nested dynamic group functionality...
 dn: cn=Dynamic List,ou=Dynamic Lists,dc=example,dc=com
@@ -435,7 +435,7 @@ cn: The Smiths
 memberURL: ldap:///ou=People,dc=example,dc=com??sub?(sn=Smith)
 description: Smith family
 member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com
-dgMemberOf: cn=meta group,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=meta group,ou=dynamic lists,dc=example,dc=com
 
 dn: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com
 objectClass: OpenLDAPperson
@@ -453,7 +453,7 @@ mail: melliot@mail.alumni.example.com
 pager: +1 313 555 7671
 facsimileTelephoneNumber: +1 313 555 7762
 telephoneNumber: +1 313 555 4177
-dgMemberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
 
 # Testing nested static group functionality...
 dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,
@@ -476,10 +476,10 @@ homePhone: +1 313 555 2333
 pager: +1 313 555 3233
 facsimileTelephoneNumber: +1 313 555 2274
 telephoneNumber: +1 313 555 9022
-dgMemberOf: cn=all staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=the jensens,ou=groups,dc=example,dc=com
-dgMemberOf: cn=jjs,ou=groups,dc=example,dc=com
-dgMemberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=all staff,ou=groups,dc=example,dc=com
+memberOf: cn=the jensens,ou=groups,dc=example,dc=com
+memberOf: cn=jjs,ou=groups,dc=example,dc=com
+memberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
 
 dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc
  =com
@@ -501,10 +501,10 @@ homePhone: +1 313 555 5444
 pager: +1 313 555 4474
 facsimileTelephoneNumber: +1 313 555 2177
 telephoneNumber: +1 313 555 0355
-dgMemberOf: cn=all staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=the jensens,ou=groups,dc=example,dc=com
-dgMemberOf: cn=jjs,ou=groups,dc=example,dc=com
-dgMemberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=all staff,ou=groups,dc=example,dc=com
+memberOf: cn=the jensens,ou=groups,dc=example,dc=com
+memberOf: cn=jjs,ou=groups,dc=example,dc=com
+memberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
 
 dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com
 objectClass: OpenLDAPperson
@@ -520,10 +520,10 @@ homePhone: +1 313 555 8421
 pager: +1 313 555 2844
 facsimileTelephoneNumber: +1 313 555 9700
 telephoneNumber: +1 313 555 5331
-dgMemberOf: cn=all staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=bonus group,ou=groups,dc=example,dc=com
-dgMemberOf: cn=alumni assoc staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=all staff,ou=groups,dc=example,dc=com
+memberOf: cn=bonus group,ou=groups,dc=example,dc=com
+memberOf: cn=alumni assoc staff,ou=groups,dc=example,dc=com
+memberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
 
 dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=example
  ,dc=com
@@ -544,9 +544,9 @@ postalAddress: Info Tech Division $ 535 W William $ Anytown, MI 48103
 pager: +1 313 555 2833
 facsimileTelephoneNumber: +1 313 555 8688
 telephoneNumber: +1 313 555 7334
-dgMemberOf: cn=jjs,ou=groups,dc=example,dc=com
-dgMemberOf: cn=all staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=jjs,ou=groups,dc=example,dc=com
+memberOf: cn=all staff,ou=groups,dc=example,dc=com
+memberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
 
 dn: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com
 objectClass: OpenLDAPperson
@@ -565,9 +565,9 @@ homePhone: +1 313 555 5445
 pager: +1 313 555 1220
 facsimileTelephoneNumber: +1 313 555 2311
 telephoneNumber: +1 313 555 4774
-dgMemberOf: cn=all staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=alumni assoc staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=all staff,ou=groups,dc=example,dc=com
+memberOf: cn=alumni assoc staff,ou=groups,dc=example,dc=com
+memberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
 
 dn: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc=com
 objectClass: OpenLDAPperson
@@ -586,8 +586,8 @@ homePhone: +1 313 555 3774
 pager: +1 313 555 6573
 facsimileTelephoneNumber: +1 313 555 4544
 telephoneNumber: +1 313 555 9394
-dgMemberOf: cn=all staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=all staff,ou=groups,dc=example,dc=com
+memberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
 
 dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com
 objectClass: OpenLDAPperson
@@ -605,12 +605,12 @@ homePhone: +1 313 555 2333
 pager: +1 313 555 6442
 facsimileTelephoneNumber: +1 313 555 2756
 telephoneNumber: +1 313 555 8232
-dgMemberOf: cn=all staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=the smiths,ou=dynamic lists,dc=example,dc=com
-dgMemberOf: cn=meta group,ou=dynamic lists,dc=example,dc=com
-dgMemberOf: cn=bonus group,ou=groups,dc=example,dc=com
-dgMemberOf: cn=alumni assoc staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=all staff,ou=groups,dc=example,dc=com
+memberOf: cn=the smiths,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=meta group,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=bonus group,ou=groups,dc=example,dc=com
+memberOf: cn=alumni assoc staff,ou=groups,dc=example,dc=com
+memberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
 
 # Testing filtered nested memberOf functionality...
 dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com
@@ -629,12 +629,12 @@ homePhone: +1 313 555 2333
 pager: +1 313 555 6442
 facsimileTelephoneNumber: +1 313 555 2756
 telephoneNumber: +1 313 555 8232
-dgMemberOf: cn=all staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=the smiths,ou=dynamic lists,dc=example,dc=com
-dgMemberOf: cn=meta group,ou=dynamic lists,dc=example,dc=com
-dgMemberOf: cn=bonus group,ou=groups,dc=example,dc=com
-dgMemberOf: cn=alumni assoc staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=all staff,ou=groups,dc=example,dc=com
+memberOf: cn=the smiths,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=meta group,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=bonus group,ou=groups,dc=example,dc=com
+memberOf: cn=alumni assoc staff,ou=groups,dc=example,dc=com
+memberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
 
 dn: cn=Meta Group,ou=Dynamic Lists,dc=example,dc=com
 objectClass: groupOfURLs
@@ -643,7 +643,7 @@ memberURL: ldap:///ou=Dynamic Lists,dc=example,dc=com??sub?(description=Smith%
  20family)
 member: cn=The Smiths,ou=Dynamic Lists,dc=example,dc=com
 member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com
-dgMemberOf: cn=bonus group,ou=groups,dc=example,dc=com
+memberOf: cn=bonus group,ou=groups,dc=example,dc=com
 
 dn: cn=The Smiths,ou=Dynamic Lists,dc=example,dc=com
 objectClass: groupOfURLs
@@ -651,8 +651,8 @@ cn: The Smiths
 memberURL: ldap:///ou=People,dc=example,dc=com??sub?(sn=Smith)
 description: Smith family
 member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com
-dgMemberOf: cn=meta group,ou=dynamic lists,dc=example,dc=com
-dgMemberOf: cn=bonus group,ou=groups,dc=example,dc=com
+memberOf: cn=meta group,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=bonus group,ou=groups,dc=example,dc=com
 
 dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com
 objectClass: OpenLDAPperson
@@ -668,10 +668,10 @@ homePhone: +1 313 555 8421
 pager: +1 313 555 2844
 facsimileTelephoneNumber: +1 313 555 9700
 telephoneNumber: +1 313 555 5331
-dgMemberOf: cn=all staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=bonus group,ou=groups,dc=example,dc=com
-dgMemberOf: cn=alumni assoc staff,ou=groups,dc=example,dc=com
-dgMemberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=all staff,ou=groups,dc=example,dc=com
+memberOf: cn=bonus group,ou=groups,dc=example,dc=com
+memberOf: cn=alumni assoc staff,ou=groups,dc=example,dc=com
+memberOf: cn=dynamic list of members,ou=dynamic lists,dc=example,dc=com
 
 # Testing filtered nested member functionality...
 dn: cn=All Staff,ou=Groups,dc=example,dc=com
@@ -747,7 +747,7 @@ memberURL: ldap:///ou=Dynamic Lists,dc=example,dc=com??sub?(description=Smith%
  20family)
 member: cn=The Smiths,ou=Dynamic Lists,dc=example,dc=com
 member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com
-dgMemberOf: cn=bonus group,ou=groups,dc=example,dc=com
+memberOf: cn=bonus group,ou=groups,dc=example,dc=com
 
 dn: cn=The Smiths,ou=Dynamic Lists,dc=example,dc=com
 objectClass: groupOfURLs
@@ -755,6 +755,6 @@ cn: The Smiths
 memberURL: ldap:///ou=People,dc=example,dc=com??sub?(sn=Smith)
 description: Smith family
 member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com
-dgMemberOf: cn=meta group,ou=dynamic lists,dc=example,dc=com
-dgMemberOf: cn=bonus group,ou=groups,dc=example,dc=com
+memberOf: cn=meta group,ou=dynamic lists,dc=example,dc=com
+memberOf: cn=bonus group,ou=groups,dc=example,dc=com
 

diff --git a/tests/scripts/test044-dynlist b/tests/scripts/test044-dynlist
index c1c4d57177e85957950425ef31bf2d3441f29f79..07ff6868a4161b4bf0d8fe69823cd3a15662965b 100755 (executable)
--- a/tests/scripts/test044-dynlist
+++ b/tests/scripts/test044-dynlist
@@ -317,6 +317,13 @@ olcDynListAttrSet: groupOfURLs memberURL sn:cn mail
 -
 EOMODS
 
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapmodify failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 echo "==========================================================" >> $LOG1
 
 echo "Testing attribute mapping"
@@ -427,6 +434,13 @@ olcDynListAttrSet: groupOfURLs memberURL member
 -
 EOMODS
 
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapmodify failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 echo "==========================================================" >> $LOG1
 
 echo "Adding a dynamic list..."
@@ -621,6 +635,13 @@ olcAccess: to dn.base="cn=Dynamic List of Members,$LISTDN" by * read
 olcAccess: to * by users read by * search
 EOMODS
 
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapmodify failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 echo "Testing list search without dgIdentity..."
 echo "# Testing list search without dgIdentity..." >> $SEARCHOUT
 $LDAPSEARCH -S "" -b "$LISTDN" -h $LOCALHOST -p $PORT1 \
@@ -644,6 +665,13 @@ add: dgIdentity
 dgIdentity: $CMPDN
 EOMODS
 
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapmodify failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 echo "Testing list search with dgIdentity..."
 echo "# Testing list search with dgIdentity..." >> $SEARCHOUT
 $LDAPSEARCH -S "" -b "$LISTDN" -h $LOCALHOST -p $PORT1 \
@@ -667,6 +695,13 @@ add: dgAuthz
 dgAuthz: dn:$BABSDN
 EOMODS
 
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapmodify failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 echo "Testing list search with dgIdentity and dgAuthz anonymously..."
 echo "# Testing list search with dgIdentity and dgAuthz anonymously..." >> $SEARCHOUT
 $LDAPSEARCH -S "" -b "$LISTDN" -h $LOCALHOST -p $PORT1 \
@@ -702,17 +737,24 @@ delete: olcDynListAttrSet
 olcDynListAttrSet: {0}
 -
 add: olcDynListAttrSet
-olcDynListAttrSet: groupOfURLs memberURL member+dgMemberOf
+olcDynListAttrSet: groupOfURLs memberURL member+memberOf
 -
 EOMODS
 
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapmodify failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 echo "==========================================================" >> $LOG1
 
 echo "Testing memberOf functionality..."
 echo "# Testing memberOf functionality..." >> $SEARCHOUT
 $LDAPSEARCH -S "" -b "ou=People,$BASEDN" -h $LOCALHOST -p $PORT1 \
        -D "$BABSDN" -w bjensen \
-       '(cn=Mark Elliot)' '*' \
+       '(cn=Mark Elliot)' '*' 'memberOf' \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -725,7 +767,7 @@ echo "Testing filtered memberOf functionality..."
 echo "# Testing filtered memberOf functionality..." >> $SEARCHOUT
 $LDAPSEARCH -S "" -b "ou=People,$BASEDN" -h $LOCALHOST -p $PORT1 \
        -D "$BABSDN" -w bjensen \
-       '(&(dgMemberOf=cn=Dynamic List of Members,ou=Dynamic Lists,dc=example,dc=com)(cn=Mark Elliot))' '*' \
+       '(&(memberOf=cn=Dynamic List of Members,ou=Dynamic Lists,dc=example,dc=com)(cn=Mark Elliot))' '*' 'memberOf' \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -744,17 +786,24 @@ delete: olcDynListAttrSet
 olcDynListAttrSet: {0}
 -
 add: olcDynListAttrSet
-olcDynListAttrSet: groupOfURLs memberURL member+dgMemberOf@groupOfNames
+olcDynListAttrSet: groupOfURLs memberURL member+memberOf@groupOfNames
 -
 EOMODS
 
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapmodify failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 echo "==========================================================" >> $LOG1
 
 echo "Testing static group memberOf functionality..."
 echo "# Testing static group memberOf functionality..." >> $SEARCHOUT
 $LDAPSEARCH -S "" -b "ou=People,$BASEDN" -h $LOCALHOST -p $PORT1 \
        -D "$BABSDN" -w bjensen \
-       '(cn=Mark Elliot)' '*' \
+       '(cn=Mark Elliot)' '*' 'memberOf' \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -773,10 +822,17 @@ delete: olcDynListAttrSet
 olcDynListAttrSet: {0}
 -
 add: olcDynListAttrSet
-olcDynListAttrSet: groupOfURLs memberURL member+dgMemberOf*
+olcDynListAttrSet: groupOfURLs memberURL member+memberOf*
 -
 EOMODS
 
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapmodify failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 echo "==========================================================" >> $LOG1
 
 echo "Adding a couple dynamic groups..."
@@ -794,11 +850,18 @@ cn: Meta Group
 memberURL: ldap:///${LISTDN}??sub?(description=Smith%20family)
 EOMODS
 
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapadd failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 echo "Testing nested dynamic group functionality..."
 echo "# Testing nested dynamic group functionality..." >> $SEARCHOUT
 $LDAPSEARCH -S "" -b "$LISTDN" -h $LOCALHOST -p $PORT1 \
        -D "$BABSDN" -w bjensen \
-       '(objectclass=*)' '*' \
+       '(objectclass=*)' '*' 'memberOf' \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -809,7 +872,7 @@ fi
 
 $LDAPSEARCH -S "" -b "ou=People,$BASEDN" -h $LOCALHOST -p $PORT1 \
        -D "$BABSDN" -w bjensen \
-       '(cn=Mark Elliot)' '*' \
+       '(cn=Mark Elliot)' '*' 'memberOf' \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -828,11 +891,18 @@ delete: olcDynListAttrSet
 olcDynListAttrSet: {0}
 -
 add: olcDynListAttrSet
-olcDynListAttrSet: groupOfURLs memberURL member+dgMemberOf@groupOfNames*
+olcDynListAttrSet: groupOfURLs memberURL member+memberOf@groupOfNames*
 olcDynListAttrSet: labeledURIObject labeledURI uniqueMember+seeAlso@groupOfUniqueNames
 -
 EOMODS
 
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapmodify failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 echo "==========================================================" >> $LOG1
 
 echo "Adding a couple static groups..."
@@ -852,11 +922,18 @@ member: cn=James A Jones 2,ou=Information Technology Division,ou=People,$BASEDN
 member: cn=The Jensens,ou=Groups,$BASEDN
 EOMODS
 
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapadd failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 echo "Testing nested static group functionality..."
 echo "# Testing nested static group functionality..." >> $SEARCHOUT
 $LDAPSEARCH -S "" -b "ou=People,$BASEDN" -h $LOCALHOST -p $PORT1 \
        -D "$BABSDN" -w bjensen \
-       '(sn=Jensen)' '*' \
+       '(sn=Jensen)' '*' 'memberOf' \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -877,7 +954,7 @@ EOMODS
 
 $LDAPSEARCH -S "" -b "ou=People,$BASEDN" -h $LOCALHOST -p $PORT1 \
        -D "$BABSDN" -w bjensen \
-       '(sn=Hampster)' '*' \
+       '(sn=Hampster)' '*' 'memberOf' \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -888,7 +965,7 @@ fi
 
 $LDAPSEARCH -S "" -b "ou=People,$BASEDN" -h $LOCALHOST -p $PORT1 \
        -D "$BABSDN" -w bjensen \
-       '(sn=Doe)' '*' \
+       '(sn=Doe)' '*' 'memberOf' \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -899,7 +976,7 @@ fi
 
 $LDAPSEARCH -S "" -b "ou=People,$BASEDN" -h $LOCALHOST -p $PORT1 \
        -D "$BABSDN" -w bjensen \
-       '(sn=Smith)' '*' \
+       '(sn=Smith)' '*' 'memberOf' \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -913,7 +990,7 @@ echo "# Testing filtered nested memberOf functionality..." >> $SEARCHOUT
 
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
        -D "$BABSDN" -w bjensen \
-       "(dgMemberOf=cn=bonus group,ou=groups,$BASEDN)" '*' \
+       "(memberOf=cn=bonus group,ou=groups,$BASEDN)" '*' 'memberOf' \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -927,7 +1004,7 @@ echo "# Testing filtered nested member functionality..." >> $SEARCHOUT
 
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
        -D "$BABSDN" -w bjensen \
-       "(member=cn=Jennifer Smith,ou=Alumni Association,ou=People,$BASEDN)" '*' \
+       "(member=cn=Jennifer Smith,ou=Alumni Association,ou=People,$BASEDN)" '*' 'memberOf' \
        >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then