For ITS#5810: Use progs/ldif-filter. Retire scripts/acfilter.sh.

[openldap] / tests / scripts / test045-syncreplication-proxied

diff --git a/tests/scripts/test045-syncreplication-proxied b/tests/scripts/test045-syncreplication-proxied
index b0f2b2322376e726ed418ae9a66de9ef8977935f..b0791c326bc772323bd80f3216e54d6293d9c0d6 100755 (executable)
--- a/tests/scripts/test045-syncreplication-proxied
+++ b/tests/scripts/test045-syncreplication-proxied
@@ -176,7 +176,7 @@ fi
 
 # get master contextCSN
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
-       '(objectClass=*)' -s base contextCSN > "${MASTEROUT}.$CHECK" 2>&1
+       -s base '(objectClass=*)' contextCSN > "${MASTEROUT}.$CHECK" 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed at master ($RC)!"
@@ -188,7 +188,7 @@ fi
 sleep 1
 for i in 1 2 3; do
        $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
-               '(objectClass=*)' -s base contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
+               -s base '(objectClass=*)' contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
        RC=$?
 
        if test $RC != 0 ; then
@@ -230,9 +230,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering master results..."
-. $LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
+$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
 #echo "Filtering slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
@@ -367,7 +367,7 @@ fi
 
 # get master contextCSN
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
-       '(objectClass=*)' -s base contextCSN > "${MASTEROUT}.$CHECK" 2>&1
+       -s base '(objectClass=*)' contextCSN > "${MASTEROUT}.$CHECK" 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed at master ($RC)!"
@@ -381,7 +381,7 @@ for i in 1 2 3; do
        sleep $SLEEP1
 
        $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
-               '(objectClass=*)' -s base contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
+               -s base '(objectClass=*)' contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
        RC=$?
 
        if test $RC != 0 ; then
@@ -420,9 +420,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering master results..."
-. $LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
+$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
 #echo "Filtering slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
@@ -474,7 +474,7 @@ KILLPIDS="$MASTERPID $SLAVEPID $PROXYPID"
 
 # get master contextCSN
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
-       '(objectClass=*)' -s base contextCSN > "${MASTEROUT}.$CHECK" 2>&1
+       -s base '(objectClass=*)' contextCSN > "${MASTEROUT}.$CHECK" 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed at master ($RC)!"
@@ -488,7 +488,7 @@ for i in 1 2 3 4 5; do
        sleep $SLEEP1
 
        $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
-               '(objectClass=*)' -s base contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
+               -s base '(objectClass=*)' contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
        RC=$?
 
        if test $RC != 0 ; then
@@ -527,9 +527,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering master results..."
-. $LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
+$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
 #echo "Filtering slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
@@ -561,7 +561,7 @@ fi
 
 # get master contextCSN
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
-       '(objectClass=*)' -s base contextCSN > "${MASTEROUT}.$CHECK" 2>&1
+       -s base '(objectClass=*)' contextCSN > "${MASTEROUT}.$CHECK" 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed at master ($RC)!"
@@ -574,7 +574,7 @@ sleep 1
 
 for i in 1 2 3; do
        $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
-               '(objectClass=*)' -s base contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
+               -s base '(objectClass=*)' contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
        RC=$?
 
        if test $RC != 0 ; then
@@ -616,9 +616,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering master results..."
-. $LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
+$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
 #echo "Filtering slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
@@ -659,7 +659,7 @@ KILLPIDS="$MASTERPID $SLAVEPID $PROXYPID"
 
 # get master contextCSN
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
-       '(objectClass=*)' -s base contextCSN > "${MASTEROUT}.$CHECK" 2>&1
+       -s base '(objectClass=*)' contextCSN > "${MASTEROUT}.$CHECK" 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed at master ($RC)!"
@@ -674,7 +674,7 @@ for i in 1 2 3 4 5; do
        sleep $SLEEP1
 
        $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
-               '(objectClass=*)' -s base contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
+               -s base '(objectClass=*)' contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
        RC=$?
 
        if test $RC != 0 ; then
@@ -713,9 +713,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering master results..."
-. $LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
+$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
 #echo "Filtering slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
@@ -758,7 +758,7 @@ if test $? != 0 ; then
        fi
 
        #echo "Filtering slave results..."
-       . $LDIFFILTER < "${SLAVEOUT}.5.1" > $SLAVEFLT
+       $LDIFFILTER < "${SLAVEOUT}.5.1" > $SLAVEFLT
 
        echo "  ${CHECK}.1 < Comparing retrieved entries from master and slave..."
        $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
@@ -799,7 +799,7 @@ fi
 
 # get master contextCSN
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
-       '(objectClass=*)' -s base contextCSN > "${MASTEROUT}.$CHECK" 2>&1
+       -s base '(objectClass=*)' contextCSN > "${MASTEROUT}.$CHECK" 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed at master ($RC)!"
@@ -811,7 +811,7 @@ fi
 sleep 1
 for i in 1 2 3; do
        $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
-               '(objectClass=*)' -s base contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
+               -s base '(objectClass=*)' contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
        RC=$?
 
        if test $RC != 0 ; then
@@ -853,9 +853,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering master results..."
-. $LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
+$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
 #echo "Filtering slave results..."
-. $LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
+$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
 
 echo "$CHECK < Comparing retrieved entries from master and slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT