Fix minor error in error text handling

Fix invalid structural object class chains in test schema

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, 

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

tests/data/do_add.1

 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

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

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

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

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

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

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

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

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

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

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

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

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
 #

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
 #

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

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
 #

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

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