From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 13 Sep 2000 20:16:13 +0000 (+0000)
Subject: Import test000-rootdse schema check and other misc changes.
X-Git-Tag: OPENLDAP_REL_ENG_2_0_2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=744d454c8babd093bfd17e72aad7963cbc114aa7;p=thirdparty%2Fopenldap.git

Import test000-rootdse schema check and other misc changes.
---

diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index 3ec9e9a1ad..95cf256d01 100644
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -16,6 +16,7 @@
 #include <ac/string.h>
 #include <ac/time.h>
 #include <ac/unistd.h>
+#include <ac/param.h>
 
 #include "ldap-int.h"
 
diff --git a/servers/slapd/schema/java.schema b/servers/slapd/schema/java.schema
index 9cbeef8293..dfbafb2924 100644
--- a/servers/slapd/schema/java.schema
+++ b/servers/slapd/schema/java.schema
@@ -137,7 +137,7 @@ attributetype ( 1.3.6.1.4.1.42.2.27.4.1.13
 #        )
 # 
 attributetype ( 1.3.6.1.4.1.42.2.27.4.1.8
-	NAME 'javaSerializedData
+	NAME 'javaSerializedData'
 	DESC 'Serialized form of a Java object'
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40
 	SINGLE-VALUE )
@@ -160,7 +160,7 @@ attributetype ( 1.3.6.1.4.1.42.2.27.4.1.8
 #          SINGLE-VALUE
 #        )
 # 
-atttributetype ( 1.3.6.1.4.1.42.2.27.4.1.10
+attributetype ( 1.3.6.1.4.1.42.2.27.4.1.10
 	NAME 'javaFactory'
 	DESC 'Fully qualified Java class name of a JNDI object factory'
 	EQUALITY caseExactMatch
diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index f3d7e044b1..e90ff1d466 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/nis.schema
 schemacheck	on
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
new file mode 100644
index 0000000000..29048878ca
--- /dev/null
+++ b/tests/data/slapd-schema.conf
@@ -0,0 +1,33 @@
+# $OpenLDAP$
+#
+# 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/corba.schema
+include ./schema/java.schema
+include ./schema/inetorgperson.schema
+include ./schema/krb5-kdc.schema
+include ./schema/misc.schema
+include ./schema/nadf.schema
+include ./schema/nis.schema
+#include ./schema/openldap.schema
+#
+schemacheck	on
+pidfile     ./test-db/slapd.pid
+argsfile    ./test-db/slapd.args
+
+#######################################################################
+# ldbm database definitions
+#######################################################################
+
+database	ldbm
+suffix		"o=OpenLDAP Project, l=Internet"
+directory	./test-db
+dbnosync
+dbnolocking
diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 6a513fa7a5..42ae7352c9 100755
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -11,6 +11,7 @@ if test "$BACKEND" = "bdb2" ; then
 	MASTERCONF=$DATADIR/slapd-bdb2-repl-master.conf
 	SLAVECONF=$DATADIR/slapd-bdb2-repl-slave.conf
 	REFSLAVECONF=$DATADIR/slapd-bdb2-ref-slave.conf
+	SCHEMACONF=$DATADIR/slapd-bdb2-schema.conf
 	TIMING="-t"
 else
 	CONF=$DATADIR/slapd.conf
@@ -20,6 +21,7 @@ else
 	MASTERCONF=$DATADIR/slapd-repl-master.conf
 	SLAVECONF=$DATADIR/slapd-repl-slave.conf
 	REFSLAVECONF=$DATADIR/slapd-ref-slave.conf
+	SCHEMACONF=$DATADIR/slapd-schema.conf
 fi
 
 TOOLARGS="-x $LDAP_TOOLARGS"
diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index 3f7a0e89fa..aedbce8859 100755
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -21,7 +21,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
+$SLAPD -f $SCHEMACONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."