fix args order to client tools; use -M instead of -e manageDSAit

diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay
index 60f0262dc00c8eb2d43fb0d8ccee8c8f6fb17aac..293b0586590bf97fdfc60087f4b1019559a41fb4 100755 (executable)
--- a/tests/scripts/test030-relay
+++ b/tests/scripts/test030-relay
@@ -118,7 +118,7 @@ fi
 BASEDN="o=Beispiel,c=DE"
 echo "modifying database \"$BASEDN\"..."
 $LDAPMODIFY -v -D "cn=Manager,$BASEDN" -h $LOCALHOST -p $PORT1 -w $PASSWD \
-       -e manageDSAit >> $TESTOUT 2>&1 << EOMODS
+       -M >> $TESTOUT 2>&1 << EOMODS
 dn: cn=Added User,ou=Alumni Association,ou=People,$BASEDN
 changetype: add
 objectClass: OpenLDAPperson
@@ -208,8 +208,8 @@ echo "      attrs=\"'*' ref\""
 BASEDN="dc=example,dc=com"
 echo " base=\"$BASEDN\"..."
 echo "#        base=\"$BASEDN\"..." >> $SEARCHOUT
-$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" "*" ref \
-       -e manageDSAit >> $SEARCHOUT 2>&1
+$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" "*" ref \
+       >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "Search failed ($RC)!"
@@ -220,8 +220,8 @@ fi
 BASEDN="o=Example,c=US"
 echo " base=\"$BASEDN\"..."
 echo "#        base=\"$BASEDN\"..." >> $SEARCHOUT
-$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" "*" ref \
-       -e manageDSAit >> $SEARCHOUT 2>&1
+$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" "*" ref \
+       >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "Search failed ($RC)!"
@@ -232,8 +232,8 @@ fi
 BASEDN="o=Esempio,c=IT"
 echo " base=\"$BASEDN\"..."
 echo "#        base=\"$BASEDN\"..." >> $SEARCHOUT
-$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" "*" ref \
-       -e manageDSAit >> $SEARCHOUT 2>&1
+$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" "*" ref \
+       >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "Search failed ($RC)!"

diff --git a/tests/scripts/test032-proxymassage b/tests/scripts/test032-proxymassage
index f263bd1a1054d58a5a6e8c0170acbb8a9bc2b597..da7fd5ffd968a92de2483a2070d501469369c6e9 100755 (executable)
--- a/tests/scripts/test032-proxymassage
+++ b/tests/scripts/test032-proxymassage
@@ -118,7 +118,7 @@ fi
 BASEDN="o=Beispiel,c=DE"
 echo "modifying database \"$BASEDN\"..."
 $LDAPMODIFY -v -D "cn=Manager,$BASEDN" -h $LOCALHOST -p $PORT1 -w $PASSWD \
-       -e manageDSAit >> $TESTOUT 2>&1 << EOMODS
+       -M >> $TESTOUT 2>&1 << EOMODS
 dn: cn=Added User,ou=Alumni Association,ou=People,$BASEDN
 changetype: add
 objectClass: OpenLDAPperson
@@ -216,8 +216,8 @@ echo "#     attrs=\"'*' ref\"" >> $SEARCHOUT
 BASEDN="dc=example,dc=com"
 echo " base=\"$BASEDN\"..."
 echo "#        base=\"$BASEDN\"..." >> $SEARCHOUT
-$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" "*" ref \
-       -e manageDSAit >> $SEARCHOUT 2>&1
+$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" "*" ref \
+       >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "Search failed ($RC)!"
@@ -228,8 +228,8 @@ fi
 BASEDN="o=Example,c=US"
 echo " base=\"$BASEDN\"..."
 echo "#        base=\"$BASEDN\"..." >> $SEARCHOUT
-$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" "*" ref \
-       -e manageDSAit >> $SEARCHOUT 2>&1
+$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" "*" ref \
+       >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "Search failed ($RC)!"
@@ -240,8 +240,8 @@ fi
 BASEDN="o=Esempio,c=IT"
 echo " base=\"$BASEDN\"..."
 echo "#        base=\"$BASEDN\"..." >> $SEARCHOUT
-$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" "*" ref \
-       -e manageDSAit >> $SEARCHOUT 2>&1
+$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" "*" ref \
+       >> $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "Search failed ($RC)!"