Commit 4d92fd2a authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5883

parent fcf97e84
......@@ -30,6 +30,7 @@ OpenLDAP 2.4.14 Engineering
Added contrib/cloak module (ITS#5872)
Build Environment
Fixed test049,test050 to work on windows (ITS#5842)
Updated test017,test018,test019 to cover more cases (ITS#5883)
Removed patch for BerkeleyDB 4.7.25 (Official patch available)
Fixed MSVC 9.0 build issues (ITS#5888)
Documentation
......
......@@ -390,3 +390,13 @@ homephone: +1 313 555 8421
pager: +1 313 555 2844
facsimiletelephonenumber: +1 313 555 9700
telephonenumber: +1 313 555 5331
dn: dc=testdomain1,dc=example,dc=com
objectclass: domain
dc: testdomain1
description: Example, Inc. modify+modrdn test domain
dn: dc=testdomain2,dc=example,dc=com
objectclass: domain
dc: testdomain2
description: Example, Inc. modify then modrdn test domain
......@@ -193,6 +193,56 @@ newsuperior: ou=Retired, ou=People, dc=example,dc=com
dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example,dc=com
changetype: delete
dn: dc=testdomain1,dc=example,dc=com
changetype: modrdn
newrdn: dc=itsdomain1
deleteoldrdn: 1
dn: dc=itsdomain1,dc=example,dc=com
changetype: modify
replace: description
description: Example, Inc. ITS test domain
EOMODS
RC=$?
if test $RC != 0 ; then
echo "ldapmodify failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
sleep $SLEEP1
echo "Performing modrdn alone on the producer..."
$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
$TESTOUT 2>&1 << EOMODS
dn: dc=testdomain2,dc=example,dc=com
changetype: modrdn
newrdn: dc=itsdomain2
deleteoldrdn: 1
EOMODS
RC=$?
if test $RC != 0 ; then
echo "ldapmodify failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
sleep $SLEEP1
echo "Performing modify alone on the producer..."
$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
$TESTOUT 2>&1 << EOMODS
dn: dc=itsdomain2,dc=example,dc=com
changetype: modify
replace: description
description: Example, Inc. itsdomain2 test domain
EOMODS
RC=$?
......
......@@ -234,6 +234,21 @@ newsuperior: ou=Retired, ou=People, dc=example,dc=com
dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example,dc=com
changetype: delete
dn: dc=testdomain1,dc=example,dc=com
changetype: modify
replace: description
description: Example, Inc. ITS test domain
dn: dc=testdomain1,dc=example,dc=com
changetype: modrdn
newrdn: dc=itsdomain1
deleteoldrdn: 1
dn: dc=testdomain2,dc=example,dc=com
changetype: modrdn
newrdn: dc=itsdomain2
deleteoldrdn: 1
EOMODS
RC=$?
......@@ -279,8 +294,20 @@ sn: Coltrane
uid: rosco
cn: Rosco P. Coltrane
dn: dc=itsdomain2,dc=example,dc=com
changetype: modify
replace: description
description: Example, Inc. itsdomain2 test domain
EOMODS
RC=$?
if test $RC != 0 ; then
echo "ldapmodify failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
echo "Restarting consumer..."
echo "RESTART" >> $LOG4
$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING >> $LOG4 2>&1 &
......
......@@ -317,6 +317,21 @@ newsuperior: ou=Retired, ou=People, dc=example,dc=com
dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example,dc=com
changetype: delete
dn: dc=testdomain1,dc=example,dc=com
changetype: modrdn
newrdn: dc=itsdomain1
deleteoldrdn: 1
dn: dc=itsdomain1,dc=example,dc=com
changetype: modify
replace: description
description: Example, Inc. ITS test domain
dn: dc=testdomain2,dc=example,dc=com
changetype: modrdn
newrdn: dc=itsdomain2
deleteoldrdn: 1
EOMODS
RC=$?
......@@ -329,6 +344,26 @@ fi
echo "Waiting 25 seconds for syncrepl to receive changes..."
sleep 25
echo "Performing modify alone on provider..."
$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
$TESTOUT 2>&1 << EOMODS
dn: dc=itsdomain2,dc=example,dc=com
changetype: modify
replace: description
description: Example, Inc. itsdomain2 test domain
EOMODS
RC=$?
if test $RC != 0 ; then
echo "ldapmodify failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
echo "Waiting $SLEEP2 seconds for syncrepl to receive changes..."
sleep $SLEEP2
echo "Using ldapsearch to read all the entries from the master..."
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
'(objectClass=*)' '*' entryCSN > $MASTEROUT 2>&1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment