Skip to content
Snippets Groups Projects
Commit d2cf3030 authored by Howard Chu's avatar Howard Chu
Browse files

Fix use of generated password

parent fe58e680
Branches
Tags
No related merge requests found
......@@ -69,7 +69,6 @@ sed -e "s/@BACKEND@/${BACKEND}/" \
-e "s;@PORT4@;${PORT4};" \
-e "s;@PORT5@;${PORT5};" \
-e "s;@PORT6@;${PORT6};" \
-e "s/@CONFIGPW@/${CONFIGPW}/" \
-e "s/@SASL_MECH@/${SASL_MECH}/" \
-e "s/@CACHETTL@/${CACHETTL}/" \
-e "s/@ENTRY_LIMIT@/${CACHE_ENTRY_LIMIT}/" \
......
......@@ -142,7 +142,7 @@ LOG6=$TESTDIR/slapd.6.log
SLAPADDLOG1=$TESTDIR/slapadd.1.log
SLURPLOG=$TESTDIR/slurp.log
CONFIGPWF=$TESTDIR/configpw
CONFIGPWF=./configpw
# args
TOOLARGS="-x $LDAP_TOOLARGS"
......
......@@ -15,7 +15,6 @@
echo "running defines.sh"
. $SRCDIR/scripts/defines.sh
PASSWD=`cat configpw`
LVL=-1
PERSONAL="(objectClass=inetOrgPerson)"
NOWHERE="/dev/null"
......@@ -200,7 +199,7 @@ fi
echo "Dynamically configuring local slapd without translucent_no_glue..."
$LDAPMODIFY -D "$TRANSLUCENTROOT" -H $URI2 -w $PASSWD <<EOF
$LDAPMODIFY -D cn=config -H $URI2 -y $CONFIGPWF <<EOF
dn: olcOverlay={0}translucent,olcDatabase={2}bdb,cn=config
changetype: modify
replace: olcTranslucentNoGlue
......@@ -601,7 +600,7 @@ fi
echo "Dynamically configuring local slapd with translucent_no_glue and translucent_string..."
$LDAPMODIFY -D "$TRANSLUCENTROOT" -H $URI2 -w $PASSWD <<EOF
$LDAPMODIFY -D cn=config -H $URI2 -y $CONFIGPWF <<EOF
dn: olcOverlay={0}translucent,olcDatabase={2}bdb,cn=config
changetype: modify
replace: olcTranslucentNoGlue
......
......@@ -23,14 +23,6 @@ fi
mkdir -p $TESTDIR $DBDIR1
$SLAPPASSWD -g -n > $CONFIGPWF
RC=$?
if test $RC != 0 ; then
echo "slappasswd failed ($RC)!"
exit $RC
fi
read CONFIGPW < $CONFIGPWF
echo "Running slapadd to build slapd database..."
. $CONFFILTER $BACKEND $MONITORDB < $VALSORTCONF > $CONF1
$SLAPADD -f $CONF1 -l $LDIFVALSORT
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment