Diff for /tests/scripts/test000-rootdse between versions 1.14.2.1 and 1.14.2.2

version 1.14.2.1, 2003/09/18 15:43:41 version 1.14.2.2, 2003/11/30 22:20:30
Line 1 Line 1
 #! /bin/sh  #! /bin/sh
 # $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.15 2003/06/04 10:06:46 hyc Exp $  # $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.17 2003/10/22 03:14:09 kurt Exp $
   
 SRCDIR="."  
 if test $# -ge 1 ; then  
         SRCDIR=$1; shift  
 fi  
   
 . $SRCDIR/scripts/args.sh $*  
   
 echo "running defines.sh"  echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh  . $SRCDIR/scripts/defines.sh
   
 echo "Datadir is $DATADIR"  mkdir -p $TESTRUN $DBDIR1
   
 echo "Cleaning up in $DBDIR..."  echo "Starting slapd on TCP/IP port $PORT1..."
   . $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $CONF1
 rm -f $DBDIR/[!C]*  $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
   
 echo "Starting slapd on TCP/IP port $PORT..."  
 . $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $DBCONF  
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &  
 PID=$!  PID=$!
 if test $WAIT != 0 ; then  if test $WAIT != 0 ; then
     echo PID $PID      echo PID $PID
     read foo      read foo
 fi  fi
   KILLPIDS="$PID"
   
 echo "Using ldapsearch to retrieve the root DSE..."  echo "Using ldapsearch to retrieve the root DSE..."
 for i in 0 1 2 3 4 5; do  for i in 0 1 2 3 4 5; do
         $LDAPSEARCH -b "" -s base -h $LOCALHOST -p $PORT '+extensibleObject' > $SEARCHOUT 2>&1          $LDAPSEARCH -b "" -s base -h $LOCALHOST -p $PORT1 '+extensibleObject' > $SEARCHOUT 2>&1
         RC=$?          RC=$?
         if test $RC = 0 ; then          if test $RC = 0 ; then
                 break                  break
Line 39  done Line 29  done
   
 if test $RC = 0 -a $MONITORDB = yes ; then  if test $RC = 0 -a $MONITORDB = yes ; then
         echo "Using ldapsearch to retrieve the cn=Monitor..."          echo "Using ldapsearch to retrieve the cn=Monitor..."
         $LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT '+extensibleObject' >> $SEARCHOUT 2>&1          $LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT1 '+extensibleObject' >> $SEARCHOUT 2>&1
         RC=$?          RC=$?
 fi  fi
   
 kill -HUP $PID  test $KILLSERVERS != no && kill -HUP $KILLPIDS
   
 cat $SEARCHOUT  cat $SEARCHOUT
   
Line 57  else Line 47  else
         fi          fi
 fi  fi
   
   
 exit $RC  exit $RC

Removed from v.1.14.2.1  
changed lines
  Added in v.1.14.2.2


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org