Remove NIS test and other cruft

diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index 5a6bdf93334a7b6e025a4cc77520c9b3953b7796..615b73bb9be25f8f3bbd2a9835ac6625a7e8fa14 100644 (file)
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -2,8 +2,6 @@
 #
 # master slapd config -- for testing
 #
-#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 bdd60db8109997f5d476b0d04962de0190bf73c6..d0596bfee44066287a61bf437904f70ad583b7f7 100644 (file)
--- a/tests/data/slapd-dnssrv.conf
+++ b/tests/data/slapd-dnssrv.conf
@@ -2,8 +2,6 @@
 #
 # DNS SRV slapd config -- for testing
 #
-#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 e90ff1d4663e0c699cd9aa0f9d7bbb244603a75a..be47c89c3e161cfde1d1bff1df8ae9e190134592 100644 (file)
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -2,8 +2,6 @@
 #
 # master slapd config -- for testing
 #
-#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
deleted file mode 100644 (file)
index 0aebb56..0000000
--- a/tests/data/slapd-nis-master.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# $OpenLDAP$
-#
-# master slapd config -- for testing
-#
-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
-schemacheck    on
-pidfile     ./test-db/slapd.pid
-argsfile    ./test-db/slapd.args
-
-#######################################################################
-# ldbm database definitions
-#######################################################################
-
-database       ldbm
-cachesize      4
-suffix         "o=SGI, c=US"
-directory      ./test-db
-rootdn         "cn=Manager, o=SGI, c=US"
-rootpw         secret
-index          objectClass     eq
-index          uid                     pres,eq,approx
-index          gidNumber               pres,eq,approx
-index          uidNumber               pres,eq,approx
-index          cn                      pres,eq,approx
-index          memberUid               pres,eq,approx
-index          macAddress              pres,eq,approx
-index          ipServiceProtocol       pres,eq,approx
-index          ipServicePort           pres,eq,approx
-index          oncRpcNumber            pres,eq,approx
-index          ipHostNumber            pres,eq,approx
-index          ipNetworkNumber         pres,eq,approx
-index          ipProtocolNumber        pres,eq,approx
-index          default         none
-lastmod                on

diff --git a/tests/data/slapd-passwd.conf b/tests/data/slapd-passwd.conf
index 78279e4f5da3379259009199a4054c83cea911e5..aafe26bdbd57dc659dfe471402d63264d6f061d1 100644 (file)
--- a/tests/data/slapd-passwd.conf
+++ b/tests/data/slapd-passwd.conf
@@ -2,8 +2,6 @@
 #
 # master slapd config -- for testing
 #
-#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 2b1681c989834cd221512adb48ff04a295469854..adf5f4aa41a3f6001945bbd9ed43d7125732ff47 100644 (file)
--- a/tests/data/slapd-pw.conf
+++ b/tests/data/slapd-pw.conf
@@ -2,8 +2,6 @@
 #
 # master slapd config -- for testing
 #
-#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 714e4e097ec27127c5837ba2174fb50d7c77668c..d6381341543c0496b40d917790b4883c16304c4e 100644 (file)
--- a/tests/data/slapd-ref-slave.conf
+++ b/tests/data/slapd-ref-slave.conf
@@ -2,8 +2,6 @@
 #
 # slave slapd config -- for default referral testing
 #
-#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 57098f378673837bf77cbe6c55847289ae0aa796..1ccaee60fdf1312bf728dc8fed4c89c079b97202 100644 (file)
--- a/tests/data/slapd-repl-master.conf
+++ b/tests/data/slapd-repl-master.conf
@@ -2,8 +2,6 @@
 #
 # master slapd config -- for testing of replication
 #
-#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 ee7fea837b26b262889f7d85915247cdec6274e4..b7b88fd3d8da88d39d45c21d73dcfb7fe9a225d0 100644 (file)
--- a/tests/data/slapd-repl-slave.conf
+++ b/tests/data/slapd-repl-slave.conf
@@ -2,8 +2,6 @@
 #
 # master slapd config -- for testing of replication
 #
-#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 29048878caa99ded7300d2f4f34850a28ee26207..e27efa78af4f64a5bdfdf0f0f72b2671ad0093c5 100644 (file)
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@@ -3,9 +3,6 @@
 # stand-alone slapd config -- for testing
 #      with indexing
 #
-#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 413b16ec671842f3794cbe01dafb95af9963144f..4215303d8caae76611e8bbf13624d3019d92bfde 100644 (file)
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@ -3,8 +3,6 @@
 # stand-alone slapd config -- for testing
 #      with indexing
 #
-#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/scripts/startup_nis_ldap_server.sh b/tests/scripts/startup_nis_ldap_server.sh
deleted file mode 100755 (executable)
index da66c86..0000000
--- a/tests/scripts/startup_nis_ldap_server.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# $OpenLDAP$
-
-if [ $# -eq 0 ]; then
-       SRCDIR="."
-else
-       SRCDIR=$1; shift
-fi
-if [ $# -eq 1 ]; then
-       BDB2=$1; shift
-fi
-
-. $SRCDIR/scripts/defines.sh $SRCDIR $BDB2
-
-# Sample NIS database in LDIF format
-NIS_LDIF=$SRCDIR/data/nis_sample.ldif
-
-# Sample configuration file for your LDAP server
-if test "$BACKEND" = "bdb2" ; then
-       NIS_CONF=$DATADIR/slapd-bdb2-nis-master.conf
-else
-       NIS_CONF=$DATADIR/slapd-nis-master.conf
-fi
-
-echo "Cleaning up in $DBDIR..."
-
-rm -f $DBDIR/[!C]*
-
-echo "Running slapadd to build slapd database..."
-$SLAPADD -f $NIS_CONF -l $NIS_LDIF
-RC=$?
-if [ $RC != 0 ]; then
-       echo "slapadd failed!"
-       exit $RC
-fi
-
-echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $NIS_CONF -p $PORT -d $LVL $TIMING > $MASTERLOG 2>&1 &
-PID=$!
-
-echo ">>>>> LDAP server with NIS schema is up! PID=$PID"
-
-
-exit 0