Partially revert prev commit, leave rs->sr_err == SLAPD_ABANDON

[openldap] / servers / slapd / schema / openldap.schema

diff --git a/servers/slapd/schema/openldap.schema b/servers/slapd/schema/openldap.schema
index d7c358eb0c1e2a275668343f46df6d08e2a18bc0..e69c6ab2e9122ef4e8cfe7d151c76fe33997b2b0 100644 (file)
--- a/servers/slapd/schema/openldap.schema
+++ b/servers/slapd/schema/openldap.schema
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2009 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -28,18 +28,11 @@ 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'
        SUP organization
-       MAY ( buildingName $ displayName $ labeledURI $ OpenLDAPtime ) )
+       MAY ( buildingName $ displayName $ labeledURI ) )
 
 objectClass ( OpenLDAPobjectClass:4
        NAME 'OpenLDAPou'
@@ -57,4 +50,5 @@ objectClass ( OpenLDAPobjectClass:5
 objectClass ( OpenLDAPobjectClass:6
        NAME 'OpenLDAPdisplayableObject'
        DESC 'OpenLDAP Displayable Object'
-       MAY displayName AUXILIARY )
+       AUXILIARY
+       MAY displayName )