From: Howard Chu <hyc@openldap.org>
Date: Wed, 24 Jan 2007 09:35:18 +0000 (+0000)
Subject: ITS#4809 do a modrdn as a normal user to check if modifiersName is
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~153
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=24e1db824ae79f0a417f92670270c5eed4557f29;p=openldap

ITS#4809 do a modrdn as a normal user to check if modifiersName is
propagated. Return all operational attributes as well as user
attributes for final comparison; DBs should be 100% identical
except for the auditContext attribute which only exists on the master.
---

diff --git a/tests/data/slapd-deltasync-master.conf b/tests/data/slapd-deltasync-master.conf
index f9474a11f6..23c0c48460 100644
--- a/tests/data/slapd-deltasync-master.conf
+++ b/tests/data/slapd-deltasync-master.conf
@@ -65,6 +65,9 @@ rootpw		secret
 #hdb#index		entryUUID,entryCSN	eq
 #ldbm#index		objectClass	eq
 #ldbm#index		cn,sn,uid	pres,eq,sub
+access to *
+	by users write
+	by * read
 
 overlay	syncprov
 #syncprov-sessionlog 100
diff --git a/tests/scripts/test043-delta-syncrepl b/tests/scripts/test043-delta-syncrepl
index 1507bf306a..fcb2bf3252 100755
--- a/tests/scripts/test043-delta-syncrepl
+++ b/tests/scripts/test043-delta-syncrepl
@@ -235,7 +235,6 @@ dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=exampl
 changetype: delete
 
 EOMODS
-
 RC=$?
 if test $RC != 0 ; then
 	echo "ldapmodify failed ($RC)!"
@@ -251,7 +250,7 @@ kill -HUP $SLAVEPID
 sleep 10
 
 echo "Modifying more entries on the master..."
-$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD >> \
+$LDAPMODIFY -v -D "$BJORNSDN" -h $LOCALHOST -p $PORT1 -w bjorn >> \
 	$TESTOUT 2>&1 << EOMODS
 dn: cn=Rosco P. Coltrane, ou=Retired, ou=People, dc=example,dc=com
 changetype: delete
@@ -271,6 +270,12 @@ cn: Rosco P. Coltrane
 dn: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com
 changetype: modify
 replace: drink
+
+dn: cn=All Staff,ou=Groups,dc=example,dc=com
+changetype: modrdn
+newrdn: cn=Some Staff
+deleteoldrdn: 1
+
 EOMODS
 
 echo "Restarting consumer..."
@@ -311,7 +316,7 @@ fi
 
 echo "Using ldapsearch to read all the entries from the master..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
-	'objectclass=*' > $MASTEROUT 2>&1
+	'objectclass=*' \* + > $MASTEROUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
@@ -322,7 +327,7 @@ fi
 
 echo "Using ldapsearch to read all the entries from the slave..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
-	'objectclass=*' > $SLAVEOUT 2>&1
+	'objectclass=*' \* + > $SLAVEOUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
@@ -334,9 +339,9 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo "Filtering master results..."
-. $LDIFFILTER < $MASTEROUT > $MASTERFLT
+. $LDIFFILTER < $MASTEROUT | grep -iv auditcontext: > $MASTERFLT
 echo "Filtering slave results..."
-. $LDIFFILTER < $SLAVEOUT > $SLAVEFLT
+. $LDIFFILTER < $SLAVEOUT | grep -iv auditcontext: > $SLAVEFLT
 
 echo "Comparing retrieved entries from master and slave..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT