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

version 1.15, 2003/06/04 10:06:46 version 1.29.2.2, 2007/08/31 23:14:09
Line 1 Line 1
 #! /bin/sh  #! /bin/sh
 # $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.14 2003/04/30 01:04:18 hyc Exp $  # $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.31 2007/01/02 19:01:19 kurt Exp $
   ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 SRCDIR="."  ##
 if test $# -ge 1 ; then  ## Copyright 1998-2007 The OpenLDAP Foundation.
         SRCDIR=$1; shift  ## All rights reserved.
 fi  ##
   ## Redistribution and use in source and binary forms, with or without
 . $SRCDIR/scripts/args.sh $*  ## modification, are permitted only as authorized by the OpenLDAP
   ## 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
   
 echo "Datadir is $DATADIR"  mkdir -p $TESTDIR $DBDIR1
   
 echo "Cleaning up in $DBDIR..."  
   
 rm -f $DBDIR/[!C]*  
   
 echo "Starting slapd on TCP/IP port $PORT..."  echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $DBCONF  . $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $CONF1
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &  $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 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"
   
   sleep 1
   
 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 37  for i in 0 1 2 3 4 5; do Line 42  for i in 0 1 2 3 4 5; do
         sleep 5          sleep 5
 done  done
   
 if test $RC = 0 -a $MONITORDB = yes ; then  if test $RC = 0 ; then
         echo "Using ldapsearch to retrieve the cn=Monitor..."          echo "Using ldapsearch to retrieve the cn=Subschema..."
         $LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT '+extensibleObject' >> $SEARCHOUT 2>&1          $LDAPSEARCH -b "cn=Subschema" -s base -h $LOCALHOST -p $PORT1 \
                   '(&(objectClasses=top)(objectClasses=2.5.6.0))' cn objectClass \
                   >> $SEARCHOUT  2>&1
         RC=$?          RC=$?
   
 fi  fi
   
 kill -HUP $PID  count=2
   if test $RC = 0 ; then
           case $MONITORDB in yes | mod)
                   count=3
                   echo "Using ldapsearch to retrieve the cn=Monitor..."
                   $LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT1 \
                           '@monitor' >> $SEARCHOUT 2>&1
                   RC=$?
                   ;;
           esac
   fi
   
   test $KILLSERVERS != no && kill -HUP $KILLPIDS
   
 cat $SEARCHOUT  cat $SEARCHOUT
   
   
 if test $RC != 0 ; then  if test $RC != 0 ; then
         echo ">>>>> Test failed"          echo ">>>>> Test failed"
 else  else
         if grep "TLS:" $SEARCHOUT; then          RC=`grep '^dn:' $SEARCHOUT | wc -l`
                 RC=-1          if test $RC != $count ; then
                   echo ">>>>> Test failed: expected $count entries, got" $RC
                   RC=1
         else          else
             echo ">>>>> Test succeeded"                  echo ">>>>> Test succeeded"
                   RC=0
         fi          fi
 fi  fi
   
   test $KILLSERVERS != no && wait
   
 exit $RC  exit $RC

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


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