From 14db7d46d98cc5e9d8b285330f105e07ec1cf70c Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 14 Aug 2021 14:21:45 +0100 Subject: [PATCH] Fix parsing error with back-ldif --- tests/scripts/test022-ppolicy | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/scripts/test022-ppolicy b/tests/scripts/test022-ppolicy index 34ee630887..2e20dd40c7 100755 --- a/tests/scripts/test022-ppolicy +++ b/tests/scripts/test022-ppolicy @@ -103,8 +103,9 @@ if test $COUNT != 2 ; then exit 1 fi -DELAY=`$LDAPSEARCH -D "$MANAGERDN" -H $URI1 -w $PASSWD \ - -b "$USER" -E accountUsability 1.1 | sed -n -e 's/.*seconds_before_unlock=\(\d*\)/\1/p'` +DTEXT=`$LDAPSEARCH -D "$MANAGERDN" -H $URI1 -w $PASSWD \ + -b "$USER" -E accountUsability 1.1` +DELAY=`echo $DTEXT | sed -n -e 's/.*seconds_before_unlock=\(\d*\)/\1/p'` echo "Waiting $DELAY seconds for lockout to reset..." sleep $DELAY @@ -119,8 +120,9 @@ if test $RC != 0 ; then exit $RC fi -DELAY=`$LDAPSEARCH -D "$MANAGERDN" -H $URI1 -w $PASSWD \ - -b "$USER" -E accountUsability 1.1 | sed -n -e 's/.*expire=\(\d*\)/\1/p'` +DTEXT=`$LDAPSEARCH -D "$MANAGERDN" -H $URI1 -w $PASSWD \ + -b "$USER" -E accountUsability 1.1` +DELAY=`echo $DTEXT | sed -n -e 's/.*expire=\(\d*\)/\1/p'` echo "Testing password expiration" echo "Waiting $DELAY seconds for password to expire..." @@ -489,8 +491,9 @@ fi $LDAPSEARCH -e ppolicy -H $URI1 -D "$USER" -w $PASS \ -b "$BASEDN" -s base > $SEARCHOUT 2>&1 -DELAY=`$LDAPSEARCH -D "$MANAGERDN" -H $URI1 -w $PASSWD \ - -b "$USER" -E accountUsability 1.1 | sed -n -e 's/.*expire=\(\d*\)/\1/p'` +DTEXT=`$LDAPSEARCH -D "$MANAGERDN" -H $URI1 -w $PASSWD \ + -b "$USER" -E accountUsability 1.1` +DELAY=`echo $DTEXT | sed -n -e 's/.*expire=\(\d*\)/\1/p'` echo "Waiting $DELAY seconds for password to expire..." sleep $DELAY @@ -734,8 +737,9 @@ delete: pwdReset EOMODS -DELAY=`$LDAPSEARCH -D "$MANAGERDN" -H $URI1 -w $PASSWD \ - -b "$USER" -E accountUsability 1.1 | sed -n -e 's/.*expire=\(\d*\)/\1/p'` +DTEXT=`$LDAPSEARCH -D "$MANAGERDN" -H $URI1 -w $PASSWD \ + -b "$USER" -E accountUsability 1.1` +DELAY=`echo $DTEXT | sed -n -e 's/.*expire=\(\d*\)/\1/p'` DELAY=`expr $DELAY - 10` echo "Testing password expiration"