From b914aee94695efbd6004906b96a515f87c2415fe Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 4 Mar 2005 17:33:26 +0000 Subject: [PATCH] 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. --- servers/slapd/schema/openldap.schema | 9 +-------- tests/data/test.schema | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/servers/slapd/schema/openldap.schema b/servers/slapd/schema/openldap.schema index bbffc7742f..c82e60a6ee 100644 --- 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 e4ebb7103c..373d8ca10f 100644 --- 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 ) -- 2.39.5