Replace OpenLDAPtime with testTime (in test.schema).

Don't muck with OpenLDAPperson or openldap.schema.
Replace OpenLDAPtime with testTime (in test.schema).
Define testPerson instead (in test.schema).
Update test004 to use new test schema.

diff --git a/servers/slapd/schema/openldap.schema b/servers/slapd/schema/openldap.schema
index bbffc7742f81e9ffa4b1cb16e90297591d5f96db..c82e60a6ee8ea7215d71d2ffc95e6750f3d039dd 100644 (file)
--- a/servers/slapd/schema/openldap.schema
+++ b/servers/slapd/schema/openldap.schema
@@ -28,13 +28,6 @@ objectIdentifier OpenLDAP OpenLDAProot:1
 objectIdentifier OpenLDAPattributeType OpenLDAP:3
 objectIdentifier OpenLDAPobjectClass OpenLDAP:4
 
-attributeType ( OpenLDAPattributeType:6
-       NAME 'OpenLDAPtime'
-       EQUALITY generalizedTimeMatch
-       ORDERING generalizedTimeOrderingMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
-       SINGLE-VALUE )
-
 objectClass ( OpenLDAPobjectClass:3
        NAME 'OpenLDAPorg'
        DESC 'OpenLDAP Organizational Object'
@@ -52,7 +45,7 @@ objectClass ( OpenLDAPobjectClass:5
        DESC 'OpenLDAP Person'
        SUP ( pilotPerson $ inetOrgPerson )
        MUST ( uid $ cn )
-       MAY ( givenName $ labeledURI $ o $ OpenLDAPtime ) )
+       MAY ( givenName $ labeledURI $ o ) )
 
 objectClass ( OpenLDAPobjectClass:6
        NAME 'OpenLDAPdisplayableObject'

diff --git a/tests/data/test.schema b/tests/data/test.schema
index e4ebb7103c842dd51c6f3f846893a7fb96f5b609..373d8ca10f8f8e20b02edbf4192146ee3647dde1 100644 (file)
--- a/tests/data/test.schema
+++ b/tests/data/test.schema
@@ -44,6 +44,6 @@ attributetype ( 1.3.6.1.4.1.4203.666.1.37
        syntax 1.3.6.1.4.1.1466.115.121.1.24
        single-value )
 
-objectClass ( 1.3.6.1.4.1.4203.666.1.37
+objectClass ( 1.3.6.1.4.1.4203.666.1.38
        name 'testPerson' sup OpenLDAPperson
        may testTime )