diff options
| -rw-r--r-- | source4/lib/ldb/tests/init.ldif | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/tests/slapd.conf | 4 | ||||
| -rwxr-xr-x | source4/lib/ldb/tests/test-extended.sh | 14 | ||||
| -rwxr-xr-x | source4/lib/ldb/tests/test-generic.sh | 8 | ||||
| -rw-r--r-- | source4/lib/ldb/tests/test-modify.ldif | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/tests/test.ldif | 102 |
6 files changed, 66 insertions, 66 deletions
diff --git a/source4/lib/ldb/tests/init.ldif b/source4/lib/ldb/tests/init.ldif index 3b0eeffe2f..1e647e6521 100644 --- a/source4/lib/ldb/tests/init.ldif +++ b/source4/lib/ldb/tests/init.ldif @@ -1,4 +1,4 @@ -dn: o=University of Michigan,c=US +dn: o=University of Michigan,c=TEST objectclass: organization objectclass: domainRelatedObject l: Ann Arbor, Michigan diff --git a/source4/lib/ldb/tests/slapd.conf b/source4/lib/ldb/tests/slapd.conf index 61c8627e18..332b3f9063 100644 --- a/source4/lib/ldb/tests/slapd.conf +++ b/source4/lib/ldb/tests/slapd.conf @@ -17,11 +17,11 @@ allow update_anon bind_anon_dn #modulepath /usr/lib/ldap #moduleload back_bdb -defaultsearchbase "o=University of Michigan,c=US" +defaultsearchbase "o=University of Michigan,c=TEST" backend bdb database bdb -suffix "o=University of Michigan,c=US" +suffix "o=University of Michigan,c=TEST" directory tests/tmp/db index objectClass eq index uid eq diff --git a/source4/lib/ldb/tests/test-extended.sh b/source4/lib/ldb/tests/test-extended.sh index 93ac2db6bd..0bcb3ebcaa 100755 --- a/source4/lib/ldb/tests/test-extended.sh +++ b/source4/lib/ldb/tests/test-extended.sh @@ -5,32 +5,32 @@ echo "Running extended search tests" rm -f $LDB_URL cat <<EOF | bin/ldbadd || exit 1 -dn: testrec1 +dn: cn=testrec1,cn=TEST i1: 1 i2: 0 i3: 1234 i4: 0x7003004 -dn: testrec2 +dn: cn=testrec2,cn=TEST i1: 0x800000 -dn: testrec3 +dn: cn=testrec3,cn=TEST i1: 0x101010101 i1: 7 -dn: auser1 +dn: cn=auser1,cn=TEST groupType: 2147483648 samAccountType: 805306368 -dn: auser2 +dn: cn=auser2,cn=TEST groupType: 2147483648 samAccountType: 805306369 -dn: auser3 +dn: cn=auser3,cn=TEST groupType: 2147483649 samAccountType: 805306370 -dn: auser4 +dn: cn=auser4,cn=TEST groupType: 2147483649 samAccountType: 805306369 EOF diff --git a/source4/lib/ldb/tests/test-generic.sh b/source4/lib/ldb/tests/test-generic.sh index 2df22e756c..02325b8356 100755 --- a/source4/lib/ldb/tests/test-generic.sh +++ b/source4/lib/ldb/tests/test-generic.sh @@ -12,8 +12,8 @@ echo "Showing modified record" $VALGRIND bin/ldbsearch '(uid=uham)' || exit 1 echo "Rename entry" -OLDDN="cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michigan,c=US" -NEWDN="cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=US" +OLDDN="cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST" +NEWDN="cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST" $VALGRIND bin/ldbrename "$OLDDN" "$NEWDN" || exit 1 echo "Showing renamed record" @@ -39,13 +39,13 @@ $VALGRIND bin/ldbsearch '(&(objectclass=person)(uid=uham)(!(uid=uhamxx)))' uid \ $VALGRIND bin/ldbsearch '(&(uid=uham)(uid=uha*)(title=*))' uid || exit 1 $VALGRIND bin/ldbsearch '((' uid && exit 1 $VALGRIND bin/ldbsearch '(objectclass=)' uid || exit 1 -$VALGRIND bin/ldbsearch -b 'cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=US' -s base "" sn || exit 1 +$VALGRIND bin/ldbsearch -b 'cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST' -s base "" sn || exit 1 echo "Starting ldbtest indexed" time $VALGRIND bin/ldbtest --num-records 1000 --num-searches 5000 || exit 1 echo "Testing one level search" -count=`$VALGRIND bin/ldbsearch -b 'ou=Groups,o=University of Michigan,c=US' -s one 'objectclass=*' none |grep ^dn | wc -l` +count=`$VALGRIND bin/ldbsearch -b 'ou=Groups,o=University of Michigan,c=TEST' -s one 'objectclass=*' none |grep ^dn | wc -l` if [ "$count" != 3 ]; then echo returned $count records - expected 3 exit 1 diff --git a/source4/lib/ldb/tests/test-modify.ldif b/source4/lib/ldb/tests/test-modify.ldif index 37ef8293e6..e5b9ca4086 100644 --- a/source4/lib/ldb/tests/test-modify.ldif +++ b/source4/lib/ldb/tests/test-modify.ldif @@ -1,5 +1,5 @@ dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US + n,c=TEST changetype: modify add: drink drink: mango lassi diff --git a/source4/lib/ldb/tests/test.ldif b/source4/lib/ldb/tests/test.ldif index 7fe3a8ffd7..66f4ba751c 100644 --- a/source4/lib/ldb/tests/test.ldif +++ b/source4/lib/ldb/tests/test.ldif @@ -1,15 +1,15 @@ -dn: ou=People,o=University of Michigan,c=US +dn: ou=People,o=University of Michigan,c=TEST objectclass: organizationalUnit objectclass: extensibleObject ou: People uidNumber: 0 gidNumber: 0 -dn: ou=Groups,o=University of Michigan,c=US +dn: ou=Groups,o=University of Michigan,c=TEST objectclass: organizationalUnit ou: Groups -dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US +dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=TEST objectclass: organizationalUnit ou: Information Technology Division description:: aMODwoPDgsKCw4PCgsOCwotFVlZQw4PCg8OCwoPDg8KCw4LCv0zDg8KDw4LCgsOD @@ -155,59 +155,59 @@ description:: UF7Dg8KDw4LCg8ODwoLDgsKCw4PCg8OCwoPDg8KCw4LCjMODwoPDgsKDw4PCgsOC #LEAD COMMENT # another comment -dn: CN=All Staff,ou=Groups,o=University of Michigan,c=US +dn: CN=All Staff,ou=Groups,o=University of Michigan,c=TEST #EMBEDDED COMMENT -member: cn=Manager,o=University of Michigan,c=US +member: cn=Manager,o=University of Michigan,c=TEST member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US + rsity of Michigan,c=TEST member: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c =US member: cn=John Doe,ou=Information Technology Division,ou=People,o=University - of Michigan,c=US + of Michigan,c=TEST member: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US + n,c=TEST member: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Mic - higan,c=US + higan,c=TEST member: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Univ - ersity of Michigan,c=US + ersity of Michigan,c=TEST member: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Mich - igan,c=US + igan,c=TEST member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mic - higan,c=US + higan,c=TEST member: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mic - higan,c=US + higan,c=TEST member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Univers - ity of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US + ity of Michigan,c=TEST +owner: cn=Manager,o=University of Michigan,c=TEST cn: All Staff description: Everyone in the sample data objectclass: groupofnames -dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US -member: cn=Manager,o=University of Michigan,c=US +dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=TEST +member: cn=Manager,o=University of Michigan,c=TEST member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mic - higan,c=US + higan,c=TEST member: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Mic - higan,c=US + higan,c=TEST member: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c =US member: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Mich - igan,c=US + igan,c=TEST member: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US + n,c=TEST member: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mic - higan,c=US -owner: cn=Manager,o=University of Michigan,c=US + higan,c=TEST +owner: cn=Manager,o=University of Michigan,c=TEST description: All Alumni Assoc Staff cn: Alumni Assoc Staff objectclass: groupofnames -dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US +dn: ou=Alumni Association,ou=People,o=University of Michigan,c=TEST objectclass: organizationalUnit ou: Alumni Association dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit - y of Michigan,c=US + y of Michigan,c=TEST objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen @@ -216,7 +216,7 @@ uid:: YmplCW5zZW4 title: Mythical Manager, Research Systems postaladdress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Ann Arbor, MI 48103-4943 -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=TEST userpassword:: YmplbnNlbg== mail: bjensen@mailgw.example.com homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 @@ -228,13 +228,13 @@ facsimiletelephonenumber: +1 313 555 2274 telephonenumber: +1 313 555 9022 dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University - of Michigan,c=US + of Michigan,c=TEST objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen uid: bjorn -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=TEST userpassword:: Ympvcm4= homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea @@ -248,7 +248,7 @@ facsimiletelephonenumber: +1 313 555 2177 telephonenumber: +1 313 555 0355 dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US + n,c=TEST objectclass: OpenLDAPperson cn: Dorothy Stevens cn: Dot Stevens @@ -256,7 +256,7 @@ sn: Stevens uid: dots title: Secretary, UM Alumni Association postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=TEST drink: Lemonade homepostaladdress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 description: Very tall @@ -265,21 +265,21 @@ telephonenumber: +1 313 555 3664 mail: dots@mail.alumni.example.com homephone: +1 313 555 0454 -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=TEST +owner: cn=Manager,o=University of Michigan,c=TEST description: All ITD Staff cn: ITD Staff objectclass: groupofuniquenames -uniquemember: cn=Manager,o=University of Michigan,c=US +uniquemember: cn=Manager,o=University of Michigan,c=TEST uniquemember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=U - niversity of Michigan,c=US + niversity of Michigan,c=TEST uniquemember: cn=James A Jones 2,ou=Information Technology Division,ou=People, - o=University of Michigan,c=US + o=University of Michigan,c=TEST uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US + rsity of Michigan,c=TEST dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US + n,c=TEST objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones @@ -287,7 +287,7 @@ cn: Jim Jones sn: Jones uid: jaj postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=TEST userpassword:: amFq homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 homephone: +1 313 555 4772 @@ -299,14 +299,14 @@ facsimiletelephonenumber: +1 313 555 4332 telephonenumber: +1 313 555 0895 dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Universi - ty of Michigan,c=US + ty of Michigan,c=TEST objectclass: OpenLDAPperson cn: James A Jones 2 cn: James Jones cn: Jim Jones sn: Doe uid: jjones -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=TEST homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 homephone: +1 313 555 8838 title: Senior Manager, Information Technology Division @@ -317,7 +317,7 @@ pager: +1 313 555 2833 facsimiletelephonenumber: +1 313 555 8688 telephonenumber: +1 313 555 7334 -dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c=US +dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST objectclass: OpenLDAPperson cn: Jane Doe cn: Jane Alverson @@ -325,7 +325,7 @@ sn: Doe uid: jdoe title: Programmer Analyst, UM Alumni Association postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=TEST homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 drink: diet coke description: Enthusiastic @@ -336,14 +336,14 @@ facsimiletelephonenumber: +1 313 555 2311 telephonenumber: +1 313 555 4774 dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan - ,c=US + ,c=TEST objectclass: OpenLDAPperson cn: Jennifer Smith cn: Jen Smith sn: Smith uid: jen postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=TEST drink: Sam Adams homepostaladdress: 1000 Maple #44 $ Ann Arbor, MI 48103 title: Telemarketer, UM Alumni Association @@ -354,14 +354,14 @@ facsimiletelephonenumber: +1 313 555 2756 telephonenumber: +1 313 555 8232 dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M - ichigan,c=US + ichigan,c=TEST objectclass: OpenLDAPperson cn: John Doe cn: Jonathon Doe sn: Doe uid: johnd postaladdress: ITD $ 535 W. William $ Ann Arbor, MI 48109 -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=TEST homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 title: System Administrator, Information Technology Division description: overworked! @@ -371,7 +371,7 @@ pager: +1 313 555 6573 facsimiletelephonenumber: +1 313 555 4544 telephonenumber: +1 313 555 9394 -dn: cn=Manager,o=University of Michigan,c=US +dn: cn=Manager,o=University of Michigan,c=TEST objectclass: person cn: Manager cn: Directory Manager @@ -388,7 +388,7 @@ cn: Mark A Elliot sn: Elliot uid: melliot postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=TEST homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 homephone: +1 313 555 0388 drink: Gasoline @@ -399,14 +399,14 @@ facsimiletelephonenumber: +1 313 555 7762 telephonenumber: +1 313 555 4177 dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US + n,c=TEST objectclass: OpenLDAPperson cn: Ursula Hampster sn: Hampster uid: uham title: Secretary, UM Alumni Association postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=TEST homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 mail: uham@mail.alumni.example.com description: a long attribute name, longer than 128 bytes so that we @@ -417,6 +417,6 @@ pager: +1 313 555 2844 facsimiletelephonenumber: +1 313 555 9700 telephonenumber: +1 313 555 5331 -dn: ou=Ldb Test,ou=People,o=University of Michigan,c=US +dn: ou=Ldb Test,ou=People,o=University of Michigan,c=TEST objectclass: organizationalUnit ou: Ldb Test |