upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 08:39:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix minor error in error text handling

Browse source 
Fix invalid structural object class chains in test schema
This commit is contained in:
Kurt Zeilenga 2001-12-19 23:41:31 +00:00
parent 948925a683
commit 39bc94082a
26 changed files with 144 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servers/slapd/schema_check.c
View file

@ -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,

20
tests/data/acl.out.master
View file

@ -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

4
tests/data/do_add.1
View file

@ -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

40
tests/data/modify.out.master
View file

@ -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

40
tests/data/modrdn.out.master
View file

@ -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

40
tests/data/modrdn.out.master.0
View file

@ -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

4
tests/data/modrdn.out.master.1
View file

@ -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

4
tests/data/modrdn.out.master.2
View file

@ -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

4
tests/data/modrdn.out.master.3
View file

@ -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

12
tests/data/search.out.master
View file

@ -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

1
tests/data/slapd-acl.conf
View file

@ -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

1
tests/data/slapd-master.conf
View file

@ -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

1
tests/data/slapd-passwd.conf
View file

@ -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

1
tests/data/slapd-pw.conf
View file

@ -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

1
tests/data/slapd-ref-slave.conf
View file

@ -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
#

1
tests/data/slapd-repl-master.conf
View file

@ -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
#

1
tests/data/slapd-repl-slave.conf
View file

@ -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

1
tests/data/slapd-repl-submaster.conf
View file

@ -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
#

1
tests/data/slapd-repl-subslave.conf
View file

@ -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

1
tests/data/slapd.conf
View file

@ -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

40
tests/data/test-ordered.ldif
View file

@ -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

40
tests/data/test.ldif
View file

@ -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

2
tests/scripts/test001-slapadd
View file

@ -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

4
tests/scripts/test004-modify
View file

@ -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

4
tests/scripts/test007-replication
View file

@ -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

4
tests/scripts/test011-subtree-repl
View file

@ -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