From c5972bf898706f596fc0f02110d9bf10fa69bbf1 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 15 Sep 2000 18:47:09 +0000 Subject: [PATCH] Remove NIS test and other 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 | 39 --------------------- 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 | 3 -- tests/data/slapd.conf | 2 -- tests/scripts/startup_nis_ldap_server.sh | 44 ------------------------ 12 files changed, 104 deletions(-) delete mode 100644 tests/data/slapd-nis-master.conf delete mode 100755 tests/scripts/startup_nis_ldap_server.sh diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf index 5a6bdf9333..615b73bb9b 100644 --- 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 bdd60db810..d0596bfee4 100644 --- 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 e90ff1d466..be47c89c3e 100644 --- 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 index 0aebb564d0..0000000000 --- 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 78279e4f5d..aafe26bdbd 100644 --- 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 2b1681c989..adf5f4aa41 100644 --- 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 714e4e097e..d638134154 100644 --- 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 57098f3786..1ccaee60fd 100644 --- 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 ee7fea837b..b7b88fd3d8 100644 --- 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 29048878ca..e27efa78af 100644 --- 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 413b16ec67..4215303d8c 100644 --- 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 index da66c86d12..0000000000 --- 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 -- 2.39.5