Commit 59bc2a69 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

updated test026

parent e5d97246
......@@ -21,6 +21,7 @@ member: ou=Sales\3B Data\2BAlgorithms,dc=example,dc=net
member:: Y249QmVmb3JlDUFmdGVyLGRjPWV4YW1wbGUsZGM9bmV0
member: cn=\23John Smith\20,dc=example,dc=net
member:: Y249THXEjWnEhw==
member: testUUID=597ae2f6-16a6-1027-98f4-abcdefabcdef,dc=Example
seeAlso: cn=John Smith\2C III,dc=example,dc=net
seeAlso: ou=Sales\3B Data\2BAlgorithms,dc=example,dc=net
seeAlso: cn=\23John Smith\20,dc=example,dc=net
......@@ -40,6 +41,7 @@ description: CN=Before\0dAfter,DC=example,DC=net
description: CN=\23John Smith\20,DC=example,DC=net
description: CN=\#John Smith\ ,DC=example,DC=net
description: CN=Lu\C4\8Di\C4\87
description: testUUID=597ae2f6-16a6-1027-98f4-abcdefABCDEF,DC=Example
dn: cn=Unescaped Equals,ou=LDAPv3,dc=example,dc=com
objectClass: groupOfNames
......@@ -120,6 +122,7 @@ member: ou=Sales\3B Data\2BAlgorithms,dc=example,dc=net
member:: Y249QmVmb3JlDUFmdGVyLGRjPWV4YW1wbGUsZGM9bmV0
member: cn=\23John Smith\20,dc=example,dc=net
member:: Y249THXEjWnEhw==
member: testUUID=597ae2f6-16a6-1027-98f4-abcdefabcdef,dc=Example
seeAlso: cn=John Smith\2C III,dc=example,dc=net
seeAlso: ou=Sales\3B Data\2BAlgorithms,dc=example,dc=net
seeAlso: cn=\23John Smith\20,dc=example,dc=net
......@@ -139,6 +142,41 @@ description: CN=Before\0dAfter,DC=example,DC=net
description: CN=\23John Smith\20,DC=example,DC=net
description: CN=\#John Smith\ ,DC=example,DC=net
description: CN=Lu\C4\8Di\C4\87
description: testUUID=597ae2f6-16a6-1027-98f4-abcdefABCDEF,DC=Example
dn: cn=Must Succeed,ou=LDAPv3,dc=example,dc=com
objectClass: groupOfNames
cn: Must Succeed
member: cn=Must Succeed,ou=LDAPv3,dc=example,dc=com
member:
member: uid=jsmith,dc=example,dc=net
member: cn=J. Smith+ou=Sales,dc=example,dc=net
member: cn=John Smith\2C III,dc=example,dc=net
member: ou=Sales\3B Data\2BAlgorithms,dc=example,dc=net
member:: Y249QmVmb3JlDUFmdGVyLGRjPWV4YW1wbGUsZGM9bmV0
member: cn=\23John Smith\20,dc=example,dc=net
member:: Y249THXEjWnEhw==
member: testUUID=597ae2f6-16a6-1027-98f4-abcdefabcdef,dc=Example
seeAlso: cn=John Smith\2C III,dc=example,dc=net
seeAlso: ou=Sales\3B Data\2BAlgorithms,dc=example,dc=net
seeAlso: cn=\23John Smith\20,dc=example,dc=net
description: "member" values contain specific DN forms;
description: "seeAlso" values contain DN forms already defined as "member",
description: but in a different string representation;
description: the following "description" values contain the "member" and
description: "seeAlso" DN string representations used above.
description: ""
description: UID=jsmith,DC=example,DC=net
description: OU=Sales+CN=J. Smith,DC=example,DC=net
description: CN=John Smith\, III,DC=example,DC=net
description: CN=John Smith\2C III,DC=example,DC=net
description: OU=Sales\; Data\+Algorithms,DC=example,DC=net
description: OU=Sales\3B Data\2BAlgorithms,DC=example,DC=net
description: CN=Before\0dAfter,DC=example,DC=net
description: CN=\23John Smith\20,DC=example,DC=net
description: CN=\#John Smith\ ,DC=example,DC=net
description: CN=Lu\C4\8Di\C4\87
description: testUUID=597ae2f6-16a6-1027-98f4-abcdefABCDEF,DC=Example
dn: cn=Name and Optional UID,ou=Related Syntaxes,dc=example,dc=com
objectClass: groupOfUniqueNames
......
......@@ -18,6 +18,7 @@ include @SCHEMADIR@/cosine.schema
include @SCHEMADIR@/inetorgperson.schema
include @SCHEMADIR@/openldap.schema
include @SCHEMADIR@/nis.schema
include @DATADIR@/test.schema
#
pidfile @TESTDIR@/slapd.1.pid
......
......@@ -24,6 +24,7 @@ member: OU=Sales\; Data\+Algorithms,DC=example,DC=net
member: CN=Before\0dAfter,DC=example,DC=net
member: CN=\23John Smith\20,DC=example,DC=net
member: CN=Lu\C4\8Di\C4\87
member: testUUID=597ae2f6-16a6-1027-98f4-abcdefABCDEF,DC=Example
# DN forms already defined as "member" in a different string representation
seeAlso: CN=John Smith\2C III,DC=example,DC=net
seeAlso: OU=Sales\3B Data\2BAlgorithms,DC=example,DC=net
......@@ -46,6 +47,7 @@ description: CN=Before\0dAfter,DC=example,DC=net
description: CN=\23John Smith\20,DC=example,DC=net
description: CN=\#John Smith\ ,DC=example,DC=net
description: CN=Lu\C4\8Di\C4\87
description: testUUID=597ae2f6-16a6-1027-98f4-abcdefABCDEF,DC=Example
dn: cn=Should Succeed,ou=LDAPv3,dc=example,dc=com
objectClass: groupOfNames
......
......@@ -36,7 +36,6 @@ attributetype ( 1.3.6.1.4.1.4203.666.1.36
SYNTAX 1.2.826.0.1.3344810.7.1 )
# generalized time testing
attributetype ( 1.3.6.1.4.1.4203.666.1.37
name 'testTime'
equality generalizedTimeMatch
......@@ -44,6 +43,14 @@ attributetype ( 1.3.6.1.4.1.4203.666.1.37
syntax 1.3.6.1.4.1.1466.115.121.1.24
single-value )
# for UUID testing
attributetype ( 1.3.6.1.4.1.4203.666.1.56
name 'testUUID'
equality UUIDMatch
ordering UUIDOrderingMatch
syntax 1.3.6.1.1.16.1 )
# for obsolete testing
attributetype ( 1.3.6.1.4.1.4203.666.1.38
name 'testObsolete'
obsolete
......@@ -59,3 +66,4 @@ objectClass ( 1.3.6.1.3.1.4203.666.3.16
name 'obsoletePerson'
obsolete auxiliary
may ( testObsolete ) )
......@@ -49,10 +49,26 @@ fi
echo "Loading database..."
$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD -c -f $LDIFDN > \
/dev/null 2>&1
$TESTOUT 2>&1
cat /dev/null > $SEARCHOUT
echo "Searching database..."
$LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
echo "# Searching database..." >> $SEARCHOUT
$LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT1 >> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapsearch failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
DN="OU=Sales+CN=J. Smith,DC=example,DC=net"
echo "Searching database for DN=\"$DN\"..."
echo "# Searching database for DN=\"$DN\"..." >> $SEARCHOUT
$LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
"(member=$DN)" >> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
......@@ -61,9 +77,12 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Searching database for DN..."
DN="testUUID=597ae2f6-16a6-1027-98f4-ABCDEFabcdef,DC=Example"
echo "Searching database for entryUUID-named DN=\"$DN\"..."
echo "# Searching database for entryUUID-named DN=\"$DN\"..." >> $SEARCHOUT
$LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
"(member=OU=Sales+CN=J. Smith,DC=example,DC=net)" >> $SEARCHOUT 2>&1
"(member=$DN)" \
>> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
......@@ -72,9 +91,11 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Searching database for uniqueMember..."
DN="dc=example,dc=com"
echo "Searching database for nameAndOptionalUID=\"$DN\"..."
echo "# Searching database for nameAndOptionalUID=\"$DN\"..." >> $SEARCHOUT
$LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
"(uniqueMember=dc=example,dc=com)" >> $SEARCHOUT 2>&1
"(uniqueMember=$DN)" >> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
......@@ -83,9 +104,11 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Searching database for uniqueMember..."
DN="dc=example,dc=com#'001000'B"
echo "Searching database for nameAndOptionalUID=\"$DN\"..."
echo "# Searching database for nameAndOptionalUID=\"$DN\"..." >> $SEARCHOUT
$LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
"(uniqueMember=dc=example,dc=com#'001000'B)" >> $SEARCHOUT 2>&1
"(uniqueMember=$DN)" >> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
......@@ -94,9 +117,11 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Searching database for uniqueMember (approx) ..."
DN="dc=example,dc=com"
echo "Searching database for uniqueMember~=\"$DN\" (approx) ..."
echo "# Searching database for uniqueMember~=\"$DN\" (approx) ..." >> $SEARCHOUT
$LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
"(uniqueMember~=dc=example,dc=com)" >> $SEARCHOUT 2>&1
"(uniqueMember~=)" >> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
......@@ -105,9 +130,11 @@ if test $RC != 0 ; then
exit $RC
fi
echo "Searching database for uniqueMember (approx) ..."
DN="dc=example,dc=com#'001000'B"
echo "Searching database for uniqueMember~=\"$DN\" (approx) ..."
echo "# Searching database for uniqueMember~=\"$DN\" (approx) ..." >> $SEARCHOUT
$LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
"(uniqueMember~=dc=example,dc=com#'001000'B)" >> $SEARCHOUT 2>&1
"(uniqueMember~=$DN)" >> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment