ldapmodify/add: Fix -P option

tests: use "ldapadd" instead of "ldapmodify -a"

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index a08ff5166757cd79625e3c1492090d819bfa3954..ebb917301951079d548d917a8152c69c64ad4fb7 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -116,7 +116,7 @@ main( int argc, char **argv )
     authmethod = LDAP_AUTH_SIMPLE;
        version = -1;
 
-    while (( i = getopt( argc, argv, "WFabckKnrtvh:p:D:w:d:f:" )) != EOF ) {
+    while (( i = getopt( argc, argv, "WFabckKnrtvh:p:D:w:d:f:P:" )) != EOF ) {
        switch( i ) {
        case 'a':       /* add */
            new = 1;

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 695c2903f87ab252bb0efc4ca45efa1da8faad2a..736d3ad75d41760e6b069088bf5c3b2554fde0ca 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -19,8 +19,6 @@ fi
 
 if test "$LDAP_PROTO" ; then
        PROTO="-P $LDAP_PROTO"
-else
-       PROTO=""
 fi
 
 PASSWDCONF=$DATADIR/slapd-passwd.conf

diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index 641a3d5c65bb980f57bd55ec1a59d374bca965c2..80a0479a6fc5d64df291b7b59383d58aae35bfb3 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -31,12 +31,12 @@ for i in 0 1 2 3 4 5; do
        fi
 done
 
-echo "Using ldapmodify to populate the database..."
-$LDAPMODIFY -a -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD < \
+echo "Using ldapadd to populate the database..."
+$LDAPADD -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD < \
        $LDIFORDERED > /dev/null 2>&1
 RC=$?
 if test $RC != 0 ; then
-       echo "ldapmodify failed!"
+       echo "ldapadd failed!"
        kill -HUP $PID
        exit $RC
 fi

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index b3d71c295c046c1cd925c6b66e5e9014b348be7d..8a79f7d3e099f0d112a63c9b1fafc307648c7385 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -67,12 +67,12 @@ echo "Starting slurpd..."
 $SLURPD -f $MASTERCONF -d 4 -t $REPLDIR > $SLURPLOG 2>&1 &
 SLURPPID=$!
 
-echo "Using ldapmodify to populate the database..."
-$LDAPMODIFY -a -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD < \
+echo "Using ldapadd to populate the database..."
+$LDAPADD -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD < \
        $LDIFORDERED > /dev/null 2>&1
 RC=$?
 if test $RC != 0 ; then
-       echo "ldapmodify failed!"
+       echo "ldapadd failed!"
        kill -HUP $PID $SLAVEPID $SLURPPID
        exit $RC
 fi