Commit 76df6a4f authored by Howard Chu's avatar Howard Chu
Browse files

Revert "Fix parsing error with back-ldif"

This reverts commit 14db7d46.
The correct fix is in 22285a1c
parent ac637676
......@@ -103,9 +103,8 @@ if test $COUNT != 2 ; then
exit 1
fi
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'`
DELAY=`$LDAPSEARCH -D "$MANAGERDN" -H $URI1 -w $PASSWD \
-b "$USER" -E accountUsability 1.1 | sed -n -e 's/.*seconds_before_unlock=\(\d*\)/\1/p'`
echo "Waiting $DELAY seconds for lockout to reset..."
sleep $DELAY
......@@ -120,9 +119,8 @@ if test $RC != 0 ; then
exit $RC
fi
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=`$LDAPSEARCH -D "$MANAGERDN" -H $URI1 -w $PASSWD \
-b "$USER" -E accountUsability 1.1 | sed -n -e 's/.*expire=\(\d*\)/\1/p'`
echo "Testing password expiration"
echo "Waiting $DELAY seconds for password to expire..."
......@@ -491,9 +489,8 @@ fi
$LDAPSEARCH -e ppolicy -H $URI1 -D "$USER" -w $PASS \
-b "$BASEDN" -s base > $SEARCHOUT 2>&1
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=`$LDAPSEARCH -D "$MANAGERDN" -H $URI1 -w $PASSWD \
-b "$USER" -E accountUsability 1.1 | sed -n -e 's/.*expire=\(\d*\)/\1/p'`
echo "Waiting $DELAY seconds for password to expire..."
sleep $DELAY
......@@ -737,9 +734,8 @@ delete: pwdReset
EOMODS
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=`$LDAPSEARCH -D "$MANAGERDN" -H $URI1 -w $PASSWD \
-b "$USER" -E accountUsability 1.1 | sed -n -e 's/.*expire=\(\d*\)/\1/p'`
DELAY=`expr $DELAY - 10`
echo "Testing password expiration"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment