From: Howard Chu <hyc@openldap.org>
Date: Tue, 17 Aug 2021 13:34:51 +0000 (+0100)
Subject: Revert "Fix parsing error with back-ldif"
X-Git-Tag: OPENLDAP_REL_ENG_2_6_0~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76df6a4f5a54da5abee5187861881ce71f5eb4ef;p=thirdparty%2Fopenldap.git

Revert "Fix parsing error with back-ldif"

This reverts commit 14db7d46d98cc5e9d8b285330f105e07ec1cf70c.
The correct fix is in 22285a1c037f8c7e04bb50b543acf45d3344778c
---

diff --git a/tests/scripts/test022-ppolicy b/tests/scripts/test022-ppolicy
index 2e20dd40c7..34ee630887 100755
--- a/tests/scripts/test022-ppolicy
+++ b/tests/scripts/test022-ppolicy
@@ -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"