From: Kurt Zeilenga Date: Wed, 19 Dec 2001 23:41:31 +0000 (+0000) Subject: Fix minor error in error text handling X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~600 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=39bc94082aa7403f8aed977ffa1ec8dcef4635e5;p=openldap Fix minor error in error text handling Fix invalid structural object class chains in test schema --- diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c index 2306eecfe6..1f1ed839fe 100644 --- a/servers/slapd/schema_check.c +++ b/servers/slapd/schema_check.c @@ -34,7 +34,7 @@ int structural_class( ObjectClass *sc = NULL; int scn = 0; - *text = "structural object error"; + *text = "structural_class: internal error"; scbv->bv_len = 0; for( i=0; ocs[i]; i++ ) { @@ -240,6 +240,8 @@ entry_schema_check( return LDAP_OBJECT_CLASS_VIOLATION; } + *text = textbuf; + oc = oc_find( nsc.bv_val ); if ( oc == NULL ) { snprintf( textbuf, textlen, diff --git a/tests/data/acl.out.master b/tests/data/acl.out.master index 546c3eb92f..5113bc17da 100644 --- a/tests/data/acl.out.master +++ b/tests/data/acl.out.master @@ -2,12 +2,12 @@ dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga n,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones 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 homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 @@ -74,11 +74,11 @@ dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit y of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn: Jensen +uid: bjensen title: Mythical Manager, Research Systems postaladdress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Ann Arbor, MI 48103-4943 @@ -96,11 +96,11 @@ dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen +uid: bjorn seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea @@ -143,12 +143,12 @@ dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Universi ty of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 homephone: +1 313 555 8838 @@ -164,11 +164,11 @@ dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M ichigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 diff --git a/tests/data/do_add.1 b/tests/data/do_add.1 index c2ca9cd0e4..c978a70854 100644 --- a/tests/data/do_add.1 +++ b/tests/data/do_add.1 @@ -1,12 +1,12 @@ cn=James A Jones 2,ou=Alumni Association,ou=People,o=University of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: James A Jones 2 cn: James Jones 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 userpassword:: amFq diff --git a/tests/data/modify.out.master b/tests/data/modify.out.master index e7309b0270..023892e496 100644 --- a/tests/data/modify.out.master +++ b/tests/data/modify.out.master @@ -34,11 +34,11 @@ dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit y of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn: Jensen +uid: bjensen title: Mythical Manager, Research Systems postaladdress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Ann Arbor, MI 48103-4943 @@ -57,11 +57,11 @@ dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen +uid: bjorn seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US userpassword:: Ympvcm4= homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 @@ -80,11 +80,11 @@ dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga n,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Dorothy Stevens cn: Dot Stevens 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 @@ -100,10 +100,10 @@ dn: cn=Gern Jensen,ou=Information Technology Division,ou=People,o=University o f Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Gern Jensen sn: Jensen +uid: gjensen title: Chief Investigator, ITD postaladdress: ITD $ 535 W. William St $ Ann Arbor, MI 48103 seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US @@ -142,12 +142,12 @@ dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga n,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones 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 userpassword:: amFq @@ -164,11 +164,11 @@ drink: Orange Juice dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Jane Doe cn: Jane Alverson 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 @@ -185,11 +185,11 @@ dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan ,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 drink: Sam Adams @@ -205,11 +205,11 @@ dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M ichigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 @@ -235,11 +235,11 @@ dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c= US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Mark Elliot 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 homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 @@ -277,10 +277,10 @@ dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga n,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 diff --git a/tests/data/modrdn.out.master b/tests/data/modrdn.out.master index e3609d434b..53e4ef8728 100644 --- a/tests/data/modrdn.out.master +++ b/tests/data/modrdn.out.master @@ -53,11 +53,11 @@ dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Univer sity of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn: Jensen +uid: bjensen title: Mythical Manager, Research Systems postaladdress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Ann Arbor, MI 48103-4943 @@ -76,11 +76,11 @@ dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Universi ty of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen +uid: bjorn seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US userpassword:: Ympvcm4= homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 @@ -98,11 +98,11 @@ dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mich igan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Dorothy Stevens cn: Dot Stevens 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 @@ -142,12 +142,12 @@ dn: cn=James A Jones II,ou=Information Technology Division,ou=People,o=Univ ersity of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: James Jones cn: Jim Jones cn: James A Jones II sn: Doe +uid: jjones seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 homephone: +1 313 555 8838 @@ -163,13 +163,13 @@ dn: cn=James A Jones III,ou=Alumni Association,ou=People,o=University of Mi chigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones cn: Jim Jones cn: James A Jones III 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 userpassword:: amFq @@ -186,11 +186,11 @@ dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c =US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Jane Doe cn: Jane Alverson 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 @@ -207,11 +207,11 @@ dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michi gan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 drink: Sam Adams @@ -227,11 +227,11 @@ dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University o f Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 @@ -257,11 +257,11 @@ dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan ,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Mark Elliot 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 homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 @@ -299,10 +299,10 @@ dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mich igan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 diff --git a/tests/data/modrdn.out.master.0 b/tests/data/modrdn.out.master.0 index 85dd15903a..34a1fe9617 100644 --- a/tests/data/modrdn.out.master.0 +++ b/tests/data/modrdn.out.master.0 @@ -53,11 +53,11 @@ dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit y of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn: Jensen +uid: bjensen title: Mythical Manager, Research Systems postaladdress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Ann Arbor, MI 48103-4943 @@ -76,11 +76,11 @@ dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen +uid: bjorn seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US userpassword:: Ympvcm4= homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 @@ -98,11 +98,11 @@ dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga n,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Dorothy Stevens cn: Dot Stevens 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 @@ -141,12 +141,12 @@ dn: cn=James A Jones II,ou=Information Technology Division,ou=People,o=Univers ity of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: James Jones cn: Jim Jones cn: James A Jones II sn: Doe +uid: jjones seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 homephone: +1 313 555 8838 @@ -162,13 +162,13 @@ dn: cn=James A Jones III,ou=Alumni Association,ou=People,o=University of Michi gan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones cn: Jim Jones cn: James A Jones III 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 userpassword:: amFq @@ -184,11 +184,11 @@ telephonenumber: +1 313 555 0895 dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Jane Doe cn: Jane Alverson 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 @@ -205,11 +205,11 @@ dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan ,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 drink: Sam Adams @@ -225,11 +225,11 @@ dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M ichigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 @@ -255,11 +255,11 @@ dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c= US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Mark Elliot 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 homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 @@ -297,10 +297,10 @@ dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga n,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 diff --git a/tests/data/modrdn.out.master.1 b/tests/data/modrdn.out.master.1 index a003fc8b71..b301f69526 100644 --- a/tests/data/modrdn.out.master.1 +++ b/tests/data/modrdn.out.master.1 @@ -2,13 +2,13 @@ dn: cn=James A Jones III,ou=Alumni Association,ou=People,o=University of Michi gan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones cn: Jim Jones cn: James A Jones III 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 userpassword:: amFq diff --git a/tests/data/modrdn.out.master.2 b/tests/data/modrdn.out.master.2 index 7a5e6418c6..ba92ce0952 100644 --- a/tests/data/modrdn.out.master.2 +++ b/tests/data/modrdn.out.master.2 @@ -2,12 +2,12 @@ dn: cn=James A Jones II,ou=Information Technology Division,ou=People,o=Univers ity of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: James Jones cn: Jim Jones cn: James A Jones II sn: Doe +uid: jjones seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 homephone: +1 313 555 8838 diff --git a/tests/data/modrdn.out.master.3 b/tests/data/modrdn.out.master.3 index f2a57d31e4..f9bff68b41 100644 --- a/tests/data/modrdn.out.master.3 +++ b/tests/data/modrdn.out.master.3 @@ -2,12 +2,12 @@ dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga n,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones 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 userpassword:: amFq diff --git a/tests/data/search.out.master b/tests/data/search.out.master index 283f7085bc..c8983217cc 100644 --- a/tests/data/search.out.master +++ b/tests/data/search.out.master @@ -2,11 +2,11 @@ dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit y of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn: Jensen +uid: bjensen title: Mythical Manager, Research Systems postaladdress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Ann Arbor, MI 48103-4943 @@ -25,11 +25,11 @@ dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen +uid: bjorn seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US userpassword:: Ympvcm4= homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 @@ -106,12 +106,12 @@ dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga n,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones 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 userpassword:: amFq diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf index df1668ed2f..a3435f7302 100644 --- a/tests/data/slapd-acl.conf +++ b/tests/data/slapd-acl.conf @@ -6,6 +6,7 @@ ucdata-path ./ucdata include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema +include ./schema/openldap.schema schemacheck off pidfile ./test-db/slapd.pid argsfile ./test-db/slapd.args diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf index 48e0461421..2bc67b4071 100644 --- a/tests/data/slapd-master.conf +++ b/tests/data/slapd-master.conf @@ -6,6 +6,7 @@ ucdata-path ./ucdata include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema +include ./schema/openldap.schema schemacheck on pidfile ./test-db/slapd.pid argsfile ./test-db/slapd.args diff --git a/tests/data/slapd-passwd.conf b/tests/data/slapd-passwd.conf index 57bb60a4e0..cfb52a7aa3 100644 --- a/tests/data/slapd-passwd.conf +++ b/tests/data/slapd-passwd.conf @@ -6,6 +6,7 @@ ucdata-path ./ucdata include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema +include ./schema/openldap.schema schemacheck on pidfile ./test-db/slapd.pid argsfile ./test-db/slapd.args diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf index 509a1e21c1..1faa185bd8 100644 --- a/tests/data/slapd-pw.conf +++ b/tests/data/slapd-pw.conf @@ -6,6 +6,7 @@ ucdata-path ./ucdata include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema +include ./schema/openldap.schema schemacheck off pidfile ./test-db/slapd.pid argsfile ./test-db/slapd.args diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf index 096c207708..9995fa0aec 100644 --- a/tests/data/slapd-ref-slave.conf +++ b/tests/data/slapd-ref-slave.conf @@ -6,6 +6,7 @@ ucdata-path ./ucdata include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema +include ./schema/openldap.schema # schemacheck off # diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf index 43419352a8..727036e2ed 100644 --- a/tests/data/slapd-repl-master.conf +++ b/tests/data/slapd-repl-master.conf @@ -6,6 +6,7 @@ ucdata-path ./ucdata include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema +include ./schema/openldap.schema # schemacheck off # diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf index 925464dacf..29319fb340 100644 --- a/tests/data/slapd-repl-slave.conf +++ b/tests/data/slapd-repl-slave.conf @@ -6,6 +6,7 @@ ucdata-path ./ucdata include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema +include ./schema/openldap.schema # schemacheck off pidfile ./test-repl/slapd.pid diff --git a/tests/data/slapd-repl-submaster.conf b/tests/data/slapd-repl-submaster.conf index 8e4e420e04..4a0075b088 100644 --- a/tests/data/slapd-repl-submaster.conf +++ b/tests/data/slapd-repl-submaster.conf @@ -6,6 +6,7 @@ ucdata-path ./ucdata include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema +include ./schema/openldap.schema # schemacheck off # diff --git a/tests/data/slapd-repl-subslave.conf b/tests/data/slapd-repl-subslave.conf index adfaed0fd7..4a73edba09 100644 --- a/tests/data/slapd-repl-subslave.conf +++ b/tests/data/slapd-repl-subslave.conf @@ -6,6 +6,7 @@ ucdata-path ./ucdata include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema +include ./schema/openldap.schema # schemacheck off pidfile ./test-repl/slapd.pid diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf index 27977a8ccf..f08b06b1c7 100644 --- a/tests/data/slapd.conf +++ b/tests/data/slapd.conf @@ -7,6 +7,7 @@ ucdata-path ./ucdata include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema +include ./schema/openldap.schema schemacheck on pidfile ./test-db/slapd.pid argsfile ./test-db/slapd.args diff --git a/tests/data/test-ordered.ldif b/tests/data/test-ordered.ldif index e128986c40..09c8723e20 100644 --- a/tests/data/test-ordered.ldif +++ b/tests/data/test-ordered.ldif @@ -86,11 +86,11 @@ dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Univer sity of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn: Jensen +uid: bjensen title: Mythical Manager, Research Systems postaladdress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Ann Arbor, MI 48103-4943 @@ -109,11 +109,11 @@ dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Universi ty of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen +uid: bjorn seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US userpassword:: Ympvcm4= homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 @@ -131,11 +131,11 @@ dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mich igan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Dorothy Stevens cn: Dot Stevens 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 @@ -164,12 +164,12 @@ dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Mich igan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones 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 userpassword:: amFq @@ -186,12 +186,12 @@ dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Unive rsity of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 homephone: +1 313 555 8838 @@ -207,11 +207,11 @@ dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c =US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Jane Doe cn: Jane Alverson 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 @@ -228,11 +228,11 @@ dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michi gan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 drink: Sam Adams @@ -248,11 +248,11 @@ dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University o f Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 @@ -278,11 +278,11 @@ dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan ,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Mark Elliot 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 homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 @@ -298,10 +298,10 @@ dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mich igan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 diff --git a/tests/data/test.ldif b/tests/data/test.ldif index d95575bacd..c3cbad58b6 100644 --- a/tests/data/test.ldif +++ b/tests/data/test.ldif @@ -53,11 +53,11 @@ dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit y of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn: Jensen +uid: bjensen title: Mythical Manager, Research Systems postaladdress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Ann Arbor, MI 48103-4943 @@ -76,11 +76,11 @@ dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen +uid: bjorn seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US userpassword:: Ympvcm4= homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 @@ -98,11 +98,11 @@ dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga n,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Dorothy Stevens cn: Dot Stevens 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 @@ -141,12 +141,12 @@ dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga n,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones 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 userpassword:: amFq @@ -163,12 +163,12 @@ dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Universi ty of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 homephone: +1 313 555 8838 @@ -183,11 +183,11 @@ telephonenumber: +1 313 555 7334 dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Jane Doe cn: Jane Alverson 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 @@ -204,11 +204,11 @@ dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan ,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 drink: Sam Adams @@ -224,11 +224,11 @@ dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M ichigan,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 @@ -254,11 +254,11 @@ dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c= US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Mark Elliot 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 homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 @@ -296,10 +296,10 @@ dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga n,c=US objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +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 diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd index 269829debc..9d3af2d827 100755 --- a/tests/scripts/test001-slapadd +++ b/tests/scripts/test001-slapadd @@ -68,7 +68,7 @@ $CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "comparison failed - database was not created correctly" echo $SEARCHFLT $LDIFFLT - diff -u $SEARCHFLT $LDIFFLT + diff -iu $SEARCHFLT $LDIFFLT exit 1 fi diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify index 42eac7b098..1eec603db6 100755 --- a/tests/scripts/test004-modify +++ b/tests/scripts/test004-modify @@ -102,10 +102,10 @@ dn: cn=Gern Jensen,ou=Information Technology Division,ou=People,o=University of changetype: add objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Gern Jensen sn: Jensen +uid: gjensen title: Chief Investigator, ITD postaladdress: ITD $ 535 W. William St $ Ann Arbor, MI 48103 seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication index b7f23ac34d..22a8aab68c 100755 --- a/tests/scripts/test007-replication +++ b/tests/scripts/test007-replication @@ -132,10 +132,10 @@ dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, o=University changetype: add objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Gern Jensen sn: Jensen +uid: gjensen title: Chief Investigator, ITD postaladdress: ITD $ 535 W. William St $ Ann Arbor, MI 48103 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US diff --git a/tests/scripts/test011-subtree-repl b/tests/scripts/test011-subtree-repl index 6fa1de066d..41fd7909d7 100755 --- a/tests/scripts/test011-subtree-repl +++ b/tests/scripts/test011-subtree-repl @@ -134,10 +134,10 @@ dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, o=University changetype: add objectclass: top objectclass: person -objectclass: organizationalPerson -objectclass: newPilotPerson +objectclass: OpenLDAPperson cn: Gern Jensen sn: Jensen +uid: gjensen title: Chief Investigator, ITD postaladdress: ITD $ 535 W. William St $ Ann Arbor, MI 48103 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US