Import test000-rootdse schema check and other misc changes.

diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index 3ec9e9a1ad798115a69325ed00de5454f8657c51..95cf256d01938ecb4efe6fd885fe700ce0439c39 100644 (file)
--- 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 9cbeef829359e3180efab3b2708dc1489cc1f1dc..dfbafb29246876a3749223d8dc51f54fbbe96039 100644 (file)
--- 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 f3d7e044b101ed1af73184cc06216602a921ec8f..e90ff1d4663e0c699cd9aa0f9d7bbb244603a75a 100644 (file)
--- 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 (file)
index 0000000..2904887
--- /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 6a513fa7a5cd80e8acc10acf9dea9a3672f73dd8..42ae7352c9705eb08e94813dcd76b43fe91e9d3c 100755 (executable)
--- 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 3f7a0e89fa3dfa952661be1133dbb3a95c01c2eb..aedbce88593b128ef805e8237493820ea17874a2 100755 (executable)
--- 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..."