mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-01-02 13:09:42 -05:00
cleanup
This commit is contained in:
parent
7e275fdc2c
commit
5ae3ee1cde
1 changed files with 33 additions and 18 deletions
|
|
@ -15,13 +15,16 @@
|
|||
|
||||
umask 077
|
||||
|
||||
# backends
|
||||
MONITORDB=${AC_monitor-no}
|
||||
BACKLDAP=${AC_ldap-ldapno}
|
||||
BACKMETA=${AC_meta-metano}
|
||||
BACKRELAY=${AC_relay-relayno}
|
||||
BACKSQL=${AC_sql-sqlno}
|
||||
RDBMS=${SLAPD_USE_SQL-rdbmsno}
|
||||
RDBMSWRITE=${SLAPD_USE_SQLWRITE-no}
|
||||
RDBMS=${SLAPD_USE_SQL-rdbmsno}
|
||||
RDBMSWRITE=${SLAPD_USE_SQLWRITE-no}
|
||||
|
||||
# overlays
|
||||
ACCESSLOG=${AC_accesslog-accesslogno}
|
||||
DDS=${AC_dds-ddsno}
|
||||
DYNLIST=${AC_dynlist-dynlistno}
|
||||
|
|
@ -34,12 +37,15 @@ SYNCPROV=${AC_syncprov-syncprovno}
|
|||
TRANSLUCENT=${AC_translucent-translucentno}
|
||||
UNIQUE=${AC_unique-uniqueno}
|
||||
VALSORT=${AC_valsort-valsortno}
|
||||
|
||||
# misc
|
||||
WITH_SASL=${AC_WITH_SASL-no}
|
||||
USE_SASL=${SLAPD_USE_SASL-no}
|
||||
WITHTLS=${AC_WITHTLS-yes}
|
||||
ACI=${AC_ACI_ENABLED-acino}
|
||||
THREADS=${AC_THREADS-threadsno}
|
||||
|
||||
# dirs
|
||||
PROGDIR=./progs
|
||||
DATADIR=${USER_DATADIR-./testdata}
|
||||
TESTDIR=${USER_TESTDIR-./testrun}
|
||||
|
|
@ -59,6 +65,10 @@ DBDIR5=$TESTDIR/db.5.a
|
|||
DBDIR6=$TESTDIR/db.6.a
|
||||
SQLCONCURRENCYDIR=$DATADIR/sql-concurrency
|
||||
|
||||
CLIENTDIR=../clients/tools
|
||||
#CLIENTDIR=/usr/local/bin
|
||||
|
||||
# conf
|
||||
CONF=$DATADIR/slapd.conf
|
||||
CONFTWO=$DATADIR/slapd2.conf
|
||||
MCONF=$DATADIR/slapd-master.conf
|
||||
|
|
@ -112,7 +122,9 @@ RSLAVECONF=$DATADIR/slapd-repl-slave-remote.conf
|
|||
PLSRSLAVECONF=$DATADIR/slapd-syncrepl-slave-persist-ldap.conf
|
||||
PLSRMASTERCONF=$DATADIR/slapd-syncrepl-multiproxy.conf
|
||||
DDSCONF=$DATADIR/slapd-dds.conf
|
||||
PASSWDCONF=$DATADIR/slapd-passwd.conf
|
||||
|
||||
# generated files
|
||||
CONF1=$TESTDIR/slapd.1.conf
|
||||
CONF2=$TESTDIR/slapd.2.conf
|
||||
CONF3=$TESTDIR/slapd.3.conf
|
||||
|
|
@ -121,14 +133,22 @@ CONF5=$TESTDIR/slapd.5.conf
|
|||
CONF6=$TESTDIR/slapd.6.conf
|
||||
ADDCONF=$TESTDIR/slapadd.conf
|
||||
|
||||
LOG1=$TESTDIR/slapd.1.log
|
||||
LOG2=$TESTDIR/slapd.2.log
|
||||
LOG3=$TESTDIR/slapd.3.log
|
||||
LOG4=$TESTDIR/slapd.4.log
|
||||
LOG5=$TESTDIR/slapd.5.log
|
||||
LOG6=$TESTDIR/slapd.6.log
|
||||
SLAPADDLOG1=$TESTDIR/slapadd.1.log
|
||||
SLURPLOG=$TESTDIR/slurp.log
|
||||
|
||||
CONFIGPWF=$TESTDIR/configpw
|
||||
|
||||
# args
|
||||
TOOLARGS="-x $LDAP_TOOLARGS"
|
||||
TOOLPROTO="-P 3"
|
||||
|
||||
PASSWDCONF=$DATADIR/slapd-passwd.conf
|
||||
|
||||
CLIENTDIR=../clients/tools
|
||||
#CLIENTDIR=/usr/local/bin
|
||||
|
||||
# cmds
|
||||
LDIFFILTER=$SRCDIR/scripts/acfilter.sh
|
||||
CONFFILTER=$SRCDIR/scripts/conf.sh
|
||||
|
||||
|
|
@ -137,8 +157,6 @@ SLAPCAT="../servers/slapd/slapd -Tc -d 0 $LDAP_VERBOSE"
|
|||
SLAPINDEX="../servers/slapd/slapd -Ti -d 0 $LDAP_VERBOSE"
|
||||
SLAPPASSWD="../servers/slapd/slapd -Tpasswd"
|
||||
|
||||
CONFIGPWF=$TESTDIR/configpw
|
||||
|
||||
unset DIFF_OPTIONS
|
||||
# NOTE: -u/-c is not that portable...
|
||||
DIFF="diff -i"
|
||||
|
|
@ -174,6 +192,8 @@ URI3="ldap://${LOCALHOST}:$PORT3/"
|
|||
URI4="ldap://${LOCALHOST}:$PORT4/"
|
||||
URI5="ldap://${LOCALHOST}:$PORT5/"
|
||||
URI6="ldap://${LOCALHOST}:$PORT6/"
|
||||
|
||||
# LDIF
|
||||
LDIF=$DATADIR/test.ldif
|
||||
LDIFGLUED=$DATADIR/test-glued.ldif
|
||||
LDIFORDERED=$DATADIR/test-ordered.ldif
|
||||
|
|
@ -208,6 +228,8 @@ LDIFTRANSLUCENTMERGED=$DATADIR/test-translucent-merged.ldif
|
|||
LDIFMETA=$DATADIR/test-meta.ldif
|
||||
LDIFVALSORT=$DATADIR/test-valsort.ldif
|
||||
SQLADD=$DATADIR/sql-add.ldif
|
||||
|
||||
# strings
|
||||
MONITOR=""
|
||||
REFDN="c=US"
|
||||
BASEDN="dc=example,dc=com"
|
||||
|
|
@ -232,15 +254,7 @@ METAMANAGERDN="cn=Manager,$METABASEDN"
|
|||
VALSORTDN="cn=Manager,o=valsort"
|
||||
VALSORTBASEDN="o=valsort"
|
||||
|
||||
LOG1=$TESTDIR/slapd.1.log
|
||||
LOG2=$TESTDIR/slapd.2.log
|
||||
LOG3=$TESTDIR/slapd.3.log
|
||||
LOG4=$TESTDIR/slapd.4.log
|
||||
LOG5=$TESTDIR/slapd.5.log
|
||||
LOG6=$TESTDIR/slapd.6.log
|
||||
SLAPADDLOG1=$TESTDIR/slapadd.1.log
|
||||
SLURPLOG=$TESTDIR/slurp.log
|
||||
|
||||
# generated outputs
|
||||
SEARCHOUT=$TESTDIR/ldapsearch.out
|
||||
SEARCHOUT2=$TESTDIR/ldapsearch2.out
|
||||
SEARCHFLT=$TESTDIR/ldapsearch.flt
|
||||
|
|
@ -270,6 +284,7 @@ MASTERFLT=$SERVER1FLT
|
|||
SLAVEOUT=$SERVER2OUT
|
||||
SLAVEFLT=$SERVER2FLT
|
||||
|
||||
# original outputs for cmp
|
||||
PROXYCACHEOUT=$DATADIR/proxycache.out
|
||||
REFERRALOUT=$DATADIR/referrals.out
|
||||
SEARCHOUTMASTER=$DATADIR/search.out.master
|
||||
|
|
|
|||
Loading…
Reference in a new issue