upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 15:49:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9848 Fix test022 when not running chaining part of the test

Browse source
This commit is contained in:
Ondřej Kuzník 2022-05-16 16:51:59 +01:00
parent 205e2f1a3e
commit cda12cd42e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/scripts/test022-ppolicy
View file

@ -568,12 +568,12 @@ mkdir $DBDIR2
sed -e "s,$DBDIR1,$DBDIR2," < $CONF1 > $CONF2 sed -e "s,$DBDIR1,$DBDIR2," < $CONF1 > $CONF2
echo "Starting slapd consumer on TCP/IP port $PORT2..." echo "Starting slapd consumer on TCP/IP port $PORT2..."
$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 & $SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
PID=$! CONSUMERPID=$!
if test $WAIT != 0 ; then if test $WAIT != 0 ; then
echo PID $PID echo CONSUMERPID $CONSUMERPID
read foo read foo
fi fi
KILLPIDS="$KILLPIDS $PID" KILLPIDS="$KILLPIDS $CONSUMERPID"
echo "Configuring syncprov on provider..." echo "Configuring syncprov on provider..."
if [ "$SYNCPROV" = syncprovmod ]; then if [ "$SYNCPROV" = syncprovmod ]; then
@ -758,6 +758,8 @@ if test $RC != 6 ; then
exit 1 exit 1
fi fi
# URI2 is not running unless we performed chaining test above
if test -n "$CONSUMERPID"; then
$LDAPMODIFY -v -D cn=config -H $URI2 -y $CONFIGPWF >> \ $LDAPMODIFY -v -D cn=config -H $URI2 -y $CONFIGPWF >> \
$TESTOUT 2>&1 << EOMODS $TESTOUT 2>&1 << EOMODS
dn: olcOverlay={0}ppolicy,olcDatabase={1}$BACKEND,cn=config dn: olcOverlay={0}ppolicy,olcDatabase={1}$BACKEND,cn=config
@ -783,6 +785,7 @@ if test $RC != 6 ; then
test $KILLSERVERS != no && kill -HUP $KILLPIDS test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit 1 exit 1
fi fi
fi
OLDPASS=$PASS OLDPASS=$PASS
PASS=newpass PASS=newpass