more uniquemember cleanup

diff --git a/tests/data/search.out.master b/tests/data/search.out.master
index ac3761d32e9dd2ef002246b61d4b1ada3e3a3e6c..20e2a7e6e7750fd3e353f3d0191e88ae7c9ef490 100644 (file)
--- 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 a042f7fa84119e3b2186636708805bae0fad10af..43b5585be3789a52005de51f09c8ff232676f748 100644 (file)
--- 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 8f7ebb3af5c7f5fcba7b10d4577a56cae3e9b0da..5a7d25a6ba0d398f759d895104b8d040ce7e9fa0 100755 (executable)
--- 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)!"