Remove cruft

diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index c0688f9104741318f8bb2d4585ca7da6ebae60a2..7d1f22291ee898352ef14bba31561632514874de 100644 (file)
--- 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 e66e58e3b7a2075851a321161836e36f12a2dc13..68a8ca683ee1775cbe0c3fb15169ca024b4e7920 100644 (file)
--- 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 a9ab4d3156c25556d832b7096c1429de76a1ad32..26cbf5e1691d2a6fa340661ef7f9b5742c7999f6 100644 (file)
--- 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 db1e2c2bb3a2595ecf4cd7923373660c0d7b7775..bd5fe326f388553e6e50b7e077f20dde384c5857 100644 (file)
--- 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 a231233f384baf57f76d0ad1a46b1844f7cc61fc..57bb60a4e085e0e7858f492b48eec11b2f8c61f7 100644 (file)
--- 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 1fd26b599241b8f4857607946f9c6d614d641a25..7697fe65b9118a019057e3ab78aaad24e7e75365 100644 (file)
--- 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 f804e4d2e0350c850534e0c489f85db08485b4b2..5994ef62702852811e0eddb1d317fb880cc84054 100644 (file)
--- 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 6df433a5029b8324473f563f749142ce4e442416..90a30b2b2a23e5632c763c5545525dafd7bf9547 100644 (file)
--- 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 84919f7b879a2da634748008acc81b4d0aea5aa0..8f2d131136db1b659ca17c3086171d025c6f7999 100644 (file)
--- 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 dce379555bce0471b3517c9c9ae9953eb5c50f18..8d99eb65dc7284726d467e1b237906e452cba53f 100644 (file)
--- 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 a15e2b7cb0b0a46bf56d7b36c4b9eaf4cd2be6df..2bab149290ccdd5476b590d055458ce8e556a509 100644 (file)
--- 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