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

Finish up ITS#5792 bits

parent 6ef448c7
......@@ -449,7 +449,7 @@ static struct slap_schema_ad_map {
"EQUALITY objectIdentifierMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 "
"SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
NULL, SLAP_AT_MANAGEABLE,
NULL, 0,
oidValidate, objectClassPretty,
NULL, NULL, objectSubClassMatch,
objectSubClassIndexer, objectSubClassFilter,
......
......@@ -51,8 +51,6 @@ modifiersName: cn=Manager,dc=example,dc=com
dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,
dc=com
objectClass: OpenLDAPperson
objectClass: obsoletePerson
cn: Barbara Jensen
cn: Babs Jensen
sn:: IEplbnNlbiA=
......@@ -72,11 +70,12 @@ facsimileTelephoneNumber: +1 313 555 2274
telephoneNumber: +1 313 555 9022
creatorsName: cn=Manager,dc=example,dc=com
testObsolete: TRUE
objectClass: obsoletePerson
objectClass: testPerson
modifiersName: cn=Manager,dc=example,dc=com
dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc
=com
objectClass: OpenLDAPperson
cn: Bjorn Jensen
cn: Biiff Jensen
sn: Jensen
......@@ -94,6 +93,7 @@ pager: +1 313 555 4474
facsimileTelephoneNumber: +1 313 555 2177
telephoneNumber: +1 313 555 0355
creatorsName: cn=Manager,dc=example,dc=com
objectClass: testPerson
modifiersName: cn=Manager,dc=example,dc=com
dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com
......@@ -303,6 +303,7 @@ modifiersName: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc
dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com
objectClass: OpenLDAPperson
objectClass: testPerson
cn: James A Jones 1
cn: James Jones
cn: Jim Jones
......
......@@ -130,22 +130,9 @@ createTimestamp: 19700101000000Z
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,
......@@ -154,9 +141,8 @@ 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
......@@ -164,8 +150,6 @@ changetype: modify
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
......@@ -176,17 +160,13 @@ objectClass: OpenLDAPperson
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..."
......
Markdown is supported
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