mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-15 03:01:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

ldapmodify/add: Fix -P option

Browse Source 
tests: use "ldapadd" instead of "ldapmodify -a"
This commit is contained in:
Kurt Zeilenga 1999-06-29 01:17:58 +00:00
parent dcc5bdfe7e
commit bf8eaf1f1e
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/tools/ldapmodify.c
View File

@ -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;

2
tests/scripts/defines.sh
View File

@ -19,8 +19,6 @@ fi
if test "$LDAP_PROTO" ; then
PROTO="-P $LDAP_PROTO"
else
PROTO=""
fi
PASSWDCONF=$DATADIR/slapd-passwd.conf

6
tests/scripts/test002-populate
View File

@ -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

6
tests/scripts/test007-replication
View File

@ -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