Add cn=monitor, cn=config, cn=schema to namingContexts.

[openldap] / tests / scripts / test005-modrdn

diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 28093e672fd34c62b35dd9d454f4bab6b04e3a83..a6115be9f2da00b383e14d65991fd9f489a37b3e 100755 (executable)
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -1,15 +1,16 @@
-#!/bin/sh
+#! /bin/sh
 
-if [ $# -eq 0 ]; then
+if test $# -eq 0 ; then
        SRCDIR="."
 else
        SRCDIR=$1; shift
 fi
-if [ $# -eq 1 ]; then
-       BDB2=$1; shift
+if test $# -eq 1 ; then
+       BACKEND=$1; shift
 fi
 
-. $SRCDIR/scripts/defines.sh $SRCDIR $BDB2
+echo "running defines.sh $SRCDIR $BACKEND"
+. $SRCDIR/scripts/defines.sh
 
 echo "Cleaning up in $DBDIR..."
 
@@ -18,7 +19,7 @@ rm -f $DBDIR/[!C]*
 echo "Running ldif2ldbm to build slapd database..."
 $LDIF2LDBM -f $CONF -i $LDIF -e ../servers/slapd/tools
 RC=$?
-if [ $RC != 0 ]; then
+if test $RC != 0 ; then
        echo "ldif2ldbm failed!"
        exit $RC
 fi
@@ -33,13 +34,13 @@ for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
                'cn=Manager' > /dev/null 2>&1
        RC=$?
-       if [ $RC = 1 ]; then
+       if test $RC = 1 ; then
                echo "Waiting 5 seconds for slapd to start..."
                sleep 5
        fi
 done
 
-if [ $RC != 0 ]; then
+if test $RC != 0 ; then
        echo "ldapsearch failed!"
        kill -HUP $PID
        exit $RC
@@ -55,7 +56,7 @@ $LDAPMODRDN -v -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD > \
        /dev/null 2>&1 'cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US' 'cn=James A Jones III'
 
 RC=$?
-if [ $RC != 0 ]; then
+if test $RC != 0 ; then
        echo "ldapmodrdn failed!"
        kill -HUP $PID
        exit $RC
@@ -66,26 +67,146 @@ $LDAPMODRDN -v -D "$MANAGERDN" -r -h localhost -p $PORT -w $PASSWD > \
        /dev/null 2>&1 'cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US' 'cn=James A Jones II'
 
 RC=$?
-if [ $RC != 0 ]; then
+if test $RC != 0 ; then
        echo "ldapmodrdn failed!"
        kill -HUP $PID
        exit $RC
 fi
 
-echo "Using ldapsearch to retrieve all the entries..."
+# Ensure the new rdn's can be found
+
+echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones III)..."
 $LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
-           'objectClass=*' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
+           'cn=James A Jones III' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
            > $SEARCHOUT 2>&1
 RC=$?
-kill -HUP $PID
-if [ $RC != 0 ]; then
+if test $RC != 0 ; then
+       echo "ldapsearch failed!"
+       kill -HUP $PID
+       exit $RC
+fi
+
+
+LDIF=$MODRDNOUTMASTER1
+
+echo "Filtering ldapsearch results..."
+. $SRCDIR/scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT
+echo "Filtering original ldif used to create database..."
+. $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
+echo "Comparing filter output..."
+cmp $SEARCHFLT $LDIFFLT
+
+if test $? != 0 ; then
+       echo "comparison failed - modrdn operations did not complete correctly"
+       kill -HUP $PID
+       exit 1
+fi
+
+
+echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones II)..."
+$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
+           'cn=James A Jones II' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
+           >  $SEARCHOUT 2>&1
+RC=$?
+if test $RC != 0 ; then
        echo "ldapsearch failed!"
+       kill -HUP $PID
+       exit $RC
+fi
+
+
+LDIF=$MODRDNOUTMASTER2
+
+echo "Filtering ldapsearch results..."
+. $SRCDIR/scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT
+echo "Filtering original ldif used to create database..."
+. $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
+echo "Comparing filter output..."
+cmp $SEARCHFLT $LDIFFLT
+
+if test $? != 0 ; then
+       echo "comparison failed - modrdn operations did not complete correctly"
+       kill -HUP $PID
+       exit 1
+fi
+
+# Ensure that you cannot find the entry for which the rdn was deleted as
+# an attribute.
+
+echo "Using ldapsearch to retrieve entries using removed rdn (cn=James A Jones 2)..."
+$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
+           'cn=James A Jones 2' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
+           > /dev/null 2>&1
+RC=$?
+if test $RC = 0 ; then
+       echo "failure: ldapsearch found attribute that was to be removed!"
+       kill -HUP $PID
        exit $RC
 fi
 
-echo "Comparing database to reference file"
-cmp $SEARCHOUT $MODRDNOUTMASTER
-if [ $? != 0 ]; then
+echo "Using ldapsearch to retrieve all the entries..."
+$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
+           'objectClass=*' > $SEARCHOUT 2>&1
+RC=$?
+if test $RC != 0 ; then
+       kill -HUP $PID
+       echo "ldapsearch failed!"
+       exit $RC
+fi
+
+LDIF=$MODRDNOUTMASTER0
+
+echo "Filtering ldapsearch results..."
+. $SRCDIR/scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT
+echo "Filtering original ldif used to create database..."
+. $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
+echo "Comparing filter output..."
+cmp $SEARCHFLT $LDIFFLT
+
+if test $? != 0 ; then
+       echo "comparison failed - modrdn operations did not complete correctly"
+       kill -HUP $PID
+       exit 1
+fi
+
+
+echo "Testing modrdn(deleteoldrdn=1), modrdn with new rdn already an att val..."
+$LDAPMODRDN -v -D "$MANAGERDN" -r -h localhost -p $PORT -w $PASSWD > \
+       /dev/null 2>&1 'cn=James A Jones III, ou=Alumni Association, ou=People, o=University of Michigan, c=US' 'cn=James A Jones 1'
+
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapmodrdn failed!"
+       kill -HUP $PID
+       exit $RC
+fi
+
+# Test that you can use modrdn with an attribute value which was previously
+# present
+
+echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones 1)..."
+$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
+           'cn=James A Jones 1' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
+           >  $SEARCHOUT 2>&1
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapsearch failed!"
+       kill -HUP $PID
+       exit $RC
+fi
+
+
+LDIF=$MODRDNOUTMASTER3
+
+echo "Filtering ldapsearch results..."
+. $SRCDIR/scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT
+echo "Filtering original ldif used to create database..."
+. $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
+echo "Comparing filter output..."
+cmp $SEARCHFLT $LDIFFLT
+
+kill -HUP $PID
+if test $? != 0 ; then
        echo "comparison failed - modrdn operations did not complete correctly"
        exit 1
 fi