From 20e8ca0ebe919019c45aef57330cc13d6eae4afe Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 15 Sep 2000 18:44:38 +0000 Subject: [PATCH] Remove cruft --- tests/data/slapd-acl.conf | 2 -- tests/data/slapd-dnssrv.conf | 2 -- tests/data/slapd-master.conf | 2 -- tests/data/slapd-nis-master.conf | 13 +++++++------ tests/data/slapd-passwd.conf | 2 -- tests/data/slapd-pw.conf | 2 -- tests/data/slapd-ref-slave.conf | 2 -- tests/data/slapd-repl-master.conf | 2 -- tests/data/slapd-repl-slave.conf | 2 -- tests/data/slapd-schema.conf | 2 -- tests/data/slapd.conf | 3 --- 11 files changed, 7 insertions(+), 27 deletions(-) diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf index c0688f9104..7d1f22291e 100644 --- a/tests/data/slapd-acl.conf +++ b/tests/data/slapd-acl.conf @@ -3,8 +3,6 @@ # master slapd config -- for testing # ucdata-path ./ucdata -#include ./data/slapd.at.conf -#include ./data/slapd.oc.conf include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema diff --git a/tests/data/slapd-dnssrv.conf b/tests/data/slapd-dnssrv.conf index e66e58e3b7..68a8ca683e 100644 --- a/tests/data/slapd-dnssrv.conf +++ b/tests/data/slapd-dnssrv.conf @@ -3,8 +3,6 @@ # DNS SRV slapd config -- for testing # ucdata-path ./ucdata -#include ./data/slapd.at.conf -#include ./data/slapd.oc.conf include ./schema/core.schema schemacheck on pidfile ./test-db/slapd.pid diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf index a9ab4d3156..26cbf5e169 100644 --- a/tests/data/slapd-master.conf +++ b/tests/data/slapd-master.conf @@ -3,8 +3,6 @@ # master slapd config -- for testing # ucdata-path ./ucdata -#include ./data/slapd.at.conf -#include ./data/slapd.oc.conf include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema diff --git a/tests/data/slapd-nis-master.conf b/tests/data/slapd-nis-master.conf index db1e2c2bb3..bd5fe326f3 100644 --- a/tests/data/slapd-nis-master.conf +++ b/tests/data/slapd-nis-master.conf @@ -1,14 +1,15 @@ # $OpenLDAP$ # # master slapd config -- for testing +# needs updating # ucdata-path ./ucdata -include ../servers/slapd/schema/others_nis.at.conf -include ../servers/slapd/schema/others_nis.oc.conf -include ../servers/slapd/schema/nis.at.conf -include ../servers/slapd/schema/nis.oc.conf -include ../servers/slapd/schema/internet_mail.at.conf -include ../servers/slapd/schema/internet_mail.oc.conf +include ./schema/others_nis.at.conf +include ./schema/others_nis.oc.conf +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 a231233f38..57bb60a4e0 100644 --- a/tests/data/slapd-passwd.conf +++ b/tests/data/slapd-passwd.conf @@ -3,8 +3,6 @@ # master slapd config -- for testing # ucdata-path ./ucdata -#include ./data/slapd.at.conf -#include ./data/slapd.oc.conf include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf index 1fd26b5992..7697fe65b9 100644 --- a/tests/data/slapd-pw.conf +++ b/tests/data/slapd-pw.conf @@ -3,8 +3,6 @@ # master slapd config -- for testing # ucdata-path ./ucdata -#include ./data/slapd.at.conf -#include ./data/slapd.oc.conf include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf index f804e4d2e0..5994ef6270 100644 --- a/tests/data/slapd-ref-slave.conf +++ b/tests/data/slapd-ref-slave.conf @@ -3,8 +3,6 @@ # slave slapd config -- for default referral testing # ucdata-path ./ucdata -#include ./data/slapd.at.conf -#include ./data/slapd.oc.conf include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf index 6df433a502..90a30b2b2a 100644 --- a/tests/data/slapd-repl-master.conf +++ b/tests/data/slapd-repl-master.conf @@ -3,8 +3,6 @@ # master slapd config -- for testing of replication # ucdata-path ./ucdata -#include ./data/slapd.at.conf -#include ./data/slapd.oc.conf include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf index 84919f7b87..8f2d131136 100644 --- a/tests/data/slapd-repl-slave.conf +++ b/tests/data/slapd-repl-slave.conf @@ -3,8 +3,6 @@ # master slapd config -- for testing of replication # ucdata-path ./ucdata -#include ./data/slapd.at.conf -#include ./data/slapd.oc.conf include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf index dce379555b..8d99eb65dc 100644 --- a/tests/data/slapd-schema.conf +++ b/tests/data/slapd-schema.conf @@ -4,8 +4,6 @@ # with indexing # ucdata-path ./ucdata -#include ./data/slapd.at.conf -#include ./data/slapd.oc.conf # include ./schema/core.schema include ./schema/cosine.schema diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf index a15e2b7cb0..2bab149290 100644 --- a/tests/data/slapd.conf +++ b/tests/data/slapd.conf @@ -4,12 +4,9 @@ # with indexing # ucdata-path ./ucdata -#include ./data/slapd.at.conf -#include ./data/slapd.oc.conf include ./schema/core.schema include ./schema/cosine.schema include ./schema/inetorgperson.schema -#include ./schema/nis.schema schemacheck on pidfile ./test-db/slapd.pid argsfile ./test-db/slapd.args -- 2.39.5