From ff8b039a4e5144a8b269f5421fce86c6e809147c Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga <kurt@openldap.org> Date: Sun, 10 Mar 2002 17:39:08 +0000 Subject: [PATCH] Clean up schema checking --- tests/data/passwd.ldif | 4 ++++ tests/data/slapd-acl.conf | 1 - tests/data/slapd-dnssrv.conf | 1 - tests/data/slapd-glue.conf | 1 - tests/data/slapd-master.conf | 1 - tests/data/slapd-nis-master.conf | 1 - tests/data/slapd-passwd.conf | 1 - tests/data/slapd-pw.conf | 1 - tests/data/slapd-ref-slave.conf | 2 -- tests/data/slapd-repl-master.conf | 2 -- tests/data/slapd-repl-slave.conf | 1 - tests/data/slapd-repl-submaster.conf | 2 -- tests/data/slapd-repl-subslave.conf | 1 - tests/data/slapd-schema.conf | 1 - tests/data/slapd.conf | 1 - 15 files changed, 4 insertions(+), 17 deletions(-) diff --git a/tests/data/passwd.ldif b/tests/data/passwd.ldif index a405003ef7..d716d67081 100644 --- a/tests/data/passwd.ldif +++ b/tests/data/passwd.ldif @@ -7,22 +7,26 @@ dn: cn=md5, o=University of Michigan, c=US objectclass: top objectclass: person cn: md5 +sn: md5 userpassword:: e01ENX1YcjRpbE96UTRQQ09xM2FRMHFidWFRPT0= dn: cn=smd5, o=University of Michigan, c=US objectclass: top objectclass: person cn: smd5 +sn: smd5 userpassword: secret dn: cn=sha, o=University of Michigan, c=US objectclass: top objectclass: person cn: sha +sn: sha userpassword:: e1NIQX01ZW42RzZNZXpScm9UM1hLcWtkUE9tWS9CZlE9 dn: cn=ssha, o=University of Michigan, c=US objectclass: top objectclass: person cn: ssha +sn: ssha userpassword: secret diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf index 3d7987794d..1a7b2b1ea5 100644 --- a/tests/data/slapd-acl.conf +++ b/tests/data/slapd-acl.conf @@ -7,7 +7,6 @@ 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-dnssrv.conf b/tests/data/slapd-dnssrv.conf index 68a8ca683e..60fef03251 100644 --- a/tests/data/slapd-dnssrv.conf +++ b/tests/data/slapd-dnssrv.conf @@ -4,7 +4,6 @@ # ucdata-path ./ucdata include ./schema/core.schema -schemacheck on pidfile ./test-db/slapd.pid argsfile ./test-db/slapd.args diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf index bbe2c22011..5bf85b1a8e 100644 --- a/tests/data/slapd-glue.conf +++ b/tests/data/slapd-glue.conf @@ -8,7 +8,6 @@ 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-master.conf b/tests/data/slapd-master.conf index 4dc1009791..2d4e879bd4 100644 --- a/tests/data/slapd-master.conf +++ b/tests/data/slapd-master.conf @@ -7,7 +7,6 @@ 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-nis-master.conf b/tests/data/slapd-nis-master.conf index a0869d3275..dc56ac87e1 100644 --- a/tests/data/slapd-nis-master.conf +++ b/tests/data/slapd-nis-master.conf @@ -10,7 +10,6 @@ include ./schema/nis.at.conf include ./schema/nis.oc.conf include ./schema/internet_mail.at.conf include ./schema/internet_mail.oc.conf -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 4af2458c94..1238d24649 100644 --- a/tests/data/slapd-passwd.conf +++ b/tests/data/slapd-passwd.conf @@ -7,7 +7,6 @@ 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 8d3f2d9a04..9f552afe50 100644 --- a/tests/data/slapd-pw.conf +++ b/tests/data/slapd-pw.conf @@ -7,7 +7,6 @@ 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 e6c3e667a3..f9335b767b 100644 --- a/tests/data/slapd-ref-slave.conf +++ b/tests/data/slapd-ref-slave.conf @@ -8,8 +8,6 @@ include ./schema/cosine.schema include ./schema/inetorgperson.schema include ./schema/openldap.schema # -schemacheck off -# pidfile ./test-repl/slapd.pid argsfile ./test-repl/slapd.args diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf index 7238b42f6b..48c1c1b9b3 100644 --- a/tests/data/slapd-repl-master.conf +++ b/tests/data/slapd-repl-master.conf @@ -8,8 +8,6 @@ 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-repl-slave.conf b/tests/data/slapd-repl-slave.conf index a38457f49e..28ab128971 100644 --- a/tests/data/slapd-repl-slave.conf +++ b/tests/data/slapd-repl-slave.conf @@ -8,7 +8,6 @@ include ./schema/cosine.schema include ./schema/inetorgperson.schema include ./schema/openldap.schema # -schemacheck off pidfile ./test-repl/slapd.pid argsfile ./test-repl/slapd.args diff --git a/tests/data/slapd-repl-submaster.conf b/tests/data/slapd-repl-submaster.conf index 426dc49ab3..699dedbcc9 100644 --- a/tests/data/slapd-repl-submaster.conf +++ b/tests/data/slapd-repl-submaster.conf @@ -8,8 +8,6 @@ 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-repl-subslave.conf b/tests/data/slapd-repl-subslave.conf index 1a094fe060..79b2f80dba 100644 --- a/tests/data/slapd-repl-subslave.conf +++ b/tests/data/slapd-repl-subslave.conf @@ -8,7 +8,6 @@ include ./schema/cosine.schema include ./schema/inetorgperson.schema include ./schema/openldap.schema # -schemacheck off pidfile ./test-repl/slapd.pid argsfile ./test-repl/slapd.args diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf index c4c8773e46..38e500accc 100644 --- a/tests/data/slapd-schema.conf +++ b/tests/data/slapd-schema.conf @@ -18,7 +18,6 @@ include ./schema/openldap.schema # include ./schema/collective.schema # -schemacheck on pidfile ./test-db/slapd.pid argsfile ./test-db/slapd.args diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf index 868fc00e73..ce2f117d57 100644 --- a/tests/data/slapd.conf +++ b/tests/data/slapd.conf @@ -8,7 +8,6 @@ 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 -- GitLab