From: Kurt Zeilenga Date: Fri, 22 Aug 2003 21:42:02 +0000 (+0000) Subject: more uniquemember cleanup X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~784 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2583276ab2ba7e111071262e17ee131463b75280;p=openldap more uniquemember cleanup --- diff --git a/tests/data/search.out.master b/tests/data/search.out.master index ac3761d32e..20e2a7e6e7 100644 --- a/tests/data/search.out.master +++ b/tests/data/search.out.master @@ -85,6 +85,19 @@ description: All Alumni Assoc Staff cn: Alumni Assoc Staff objectclass: groupofnames +dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US +owner: cn=Manager,o=University of Michigan,c=US +description: All ITD Staff +cn: ITD Staff +objectClass: groupOfUniqueNames +uniqueMember: cn=Manager,o=University of Michigan,c=US +uniqueMember: cn=Bjorn Jensen,ou=Information Technology Division,ou=PEOPLE,o=U + niversity of Michigan,c=US +uniqueMember: cn=James A Jones 2,ou=Information Technology Division,ou=PEOPLE, + o=University of Michigan,c=US +uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive + rsity of Michigan,c=US + dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga n,c=US objectclass: OpenLDAPperson diff --git a/tests/data/search.out.xsearch b/tests/data/search.out.xsearch index a042f7fa84..43b5585be3 100644 --- a/tests/data/search.out.xsearch +++ b/tests/data/search.out.xsearch @@ -115,6 +115,19 @@ dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US objectClass: organizationalUnit ou: Information Technology Division +dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US +owner: cn=Manager,o=University of Michigan,c=US +description: All ITD Staff +cn: ITD Staff +objectClass: groupOfUniqueNames +uniqueMember: cn=Manager,o=University of Michigan,c=US +uniqueMember: cn=Bjorn Jensen,ou=Information Technology Division,ou=PEOPLE,o=U + niversity of Michigan,c=US +uniqueMember: cn=James A Jones 2,ou=Information Technology Division,ou=PEOPLE, + o=University of Michigan,c=US +uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive + rsity of Michigan,c=US + dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga n,c=US objectClass: OpenLDAPperson diff --git a/tests/scripts/test015-xsearch b/tests/scripts/test015-xsearch index 8f7ebb3af5..5a7d25a6ba 100755 --- a/tests/scripts/test015-xsearch +++ b/tests/scripts/test015-xsearch @@ -73,7 +73,7 @@ fi echo "Testing OR searching..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \ - '(|(givenName=XX*YY*Z)(cn=)(undef=*)(objectclass=groupofnames)(sn:caseExactMatch:=Jones))' >> $SEARCHOUT 2>&1 + '(|(givenName=XX*YY*Z)(cn=)(undef=*)(objectclass=groupofnames)(objectclass=groupofuniquenames)(sn:caseExactMatch:=Jones))' >> $SEARCHOUT 2>&1 RC=$? if test $RC != 0 ; then echo "ldapsearch failed ($RC)!" @@ -83,7 +83,7 @@ fi echo "Testing AND matching and ends-with searching..." $LDAPSEARCH -S "" -b "ou=groups,$BASEDN" -s one -h $LOCALHOST -p $PORT \ - '(&(objectclass=groupofnames)(cn=A*))' >> $SEARCHOUT 2>&1 + '(&(|(objectclass=groupofnames)(objectclass=groupofuniquenames))(cn=A*))' >> $SEARCHOUT 2>&1 RC=$? if test $RC != 0 ; then echo "ldapsearch failed ($RC)!"