mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-27 03:20:22 +08:00
Revert "Fix parsing error with back-ldif"
This reverts commit 14db7d46d9
.
The correct fix is in 22285a1c037f8c7e04bb50b543acf45d3344778c
This commit is contained in:
parent
ac637676f8
commit
76df6a4f5a
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user