# $OpenLDAP$
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
-## Copyright 1998-2008 The OpenLDAP Foundation.
+## Copyright 1998-2013 The OpenLDAP Foundation.
## All rights reserved.
##
## Redistribution and use in source and binary forms, with or without
. $SRCDIR/scripts/defines.sh
if test $BACKEND = "ldif" ; then
- echo "LDIF backend does not support manageDIT control, test skipped"
+ echo "LDIF backend does not support relax control, test skipped"
exit 0
fi
modifiersName: cn=Someone Else
modifyTimestamp: 19700101000000Z
entryUUID: badbadef-dbad-1029-92f7-badbadbadbad
-EOMODS
-RC=$?
-if test $RC != 0 ; then
- echo "ldapmodify failed ($RC)!"
- test $KILLSERVERS != no && kill -HUP $KILLPIDS
- exit $RC
-fi
-
-echo "Testing modify, add, and delete..."
-$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD \
- -e \!relax > \
- $TESTOUT 2>&1 << EOMODS
-version: 1
#
-# Non-working tests
+# Tests that did not work until ITS#5792
#
dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,
changetype: modify
replace: objectClass
objectClass: obsoletePerson
+objectClass: testPerson
-
-replace: structuralObjectClass
-structuralObjectClass: testPerson
dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com
# update structural object class of entry via objectClass add
add: objectClass
objectClass: testPerson
-
-replace: structuralObjectClass
-structuralObjectClass: testPerson
dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com
# update structural object class of entry via objectClass delete/add
add: objectClass
objectClass: testPerson
-
-delete: structuralObjectClass
--
-add: structuralObjectClass
-structuralObjectClass: testPerson
EOMODS
RC=$?
if test $RC != 0 ; then
- echo "ldapmodify failed ($RC)! IGNORED"
-# test $KILLSERVERS != no && kill -HUP $KILLPIDS
-# exit $RC
+ echo "ldapmodify failed ($RC)!"
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
+ exit $RC
fi
echo "Using ldapsearch to retrieve all the entries..."
LDIF=$MANAGEOUT
echo "Filtering ldapsearch results..."
-. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
echo "Filtering original ldif used to create database..."
-. $LDIFFILTER < $LDIF > $LDIFFLT
+$LDIFFILTER < $LDIF > $LDIFFLT
echo "Comparing filter output..."
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT