Diff for /tests/scripts/test000-rootdse between versions 1.14.2.5 and 1.15

version 1.14.2.5, 2005/01/20 17:01:21 version 1.15, 2003/06/04 10:06:46
Line 1 Line 1
 #! /bin/sh  #! /bin/sh
 # $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.14.2.4 2004/01/01 18:16:43 kurt Exp $  # $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.14 2003/04/30 01:04:18 hyc Exp $
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.  
 ##  SRCDIR="."
 ## Copyright 1998-2005 The OpenLDAP Foundation.  if test $# -ge 1 ; then
 ## All rights reserved.          SRCDIR=$1; shift
 ##  fi
 ## Redistribution and use in source and binary forms, with or without  
 ## modification, are permitted only as authorized by the OpenLDAP  . $SRCDIR/scripts/args.sh $*
 ## Public License.  
 ##  
 ## A copy of this license is available in the file LICENSE in the  
 ## top-level directory of the distribution or, alternatively, at  
 ## <http://www.OpenLDAP.org/license.html>.  
   
 echo "running defines.sh"  echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh  . $SRCDIR/scripts/defines.sh
   
 mkdir -p $TESTRUN $DBDIR1  echo "Datadir is $DATADIR"
   
 echo "Starting slapd on TCP/IP port $PORT1..."  echo "Cleaning up in $DBDIR..."
 . $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $CONF1  
 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &  rm -f $DBDIR/[!C]*
   
   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 $PORT1 '+extensibleObject' > $SEARCHOUT 2>&1          $LDAPSEARCH -b "" -s base -h $LOCALHOST -p $PORT '+extensibleObject' > $SEARCHOUT 2>&1
         RC=$?          RC=$?
         if test $RC = 0 ; then          if test $RC = 0 ; then
                 break                  break
Line 41  done Line 39  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 $PORT1 '+extensibleObject' >> $SEARCHOUT 2>&1          $LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT '+extensibleObject' >> $SEARCHOUT 2>&1
         RC=$?          RC=$?
 fi  fi
   
 test $KILLSERVERS != no && kill -HUP $KILLPIDS  kill -HUP $PID
   
 cat $SEARCHOUT  cat $SEARCHOUT
   
Line 59  else Line 57  else
         fi          fi
 fi  fi
   
   
 exit $RC  exit $RC

Removed from v.1.14.2.5  
changed lines
  Added in v.1.15


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