mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-17 14:00:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Import test000-rootdse schema check and other misc changes.

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-09-13 20:16:13 +00:00
parent de05e4f629
commit 744d454c8b
6 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/libldap/tls.c
View File

@ -16,6 +16,7 @@
#include <ac/string.h>
#include <ac/time.h>
#include <ac/unistd.h>
#include <ac/param.h>
#include "ldap-int.h"

4
servers/slapd/schema/java.schema
View File

@ -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

1
tests/data/slapd-master.conf
View File

@ -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

33
tests/data/slapd-schema.conf Normal file
View File

@ -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

2
tests/scripts/defines.sh
View File

@ -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"

2
tests/scripts/test000-rootdse
View File

@ -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..."