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 d38c68d00eacd64e95090931aeb68b2ab70bd621..e69c6ab2e9122ef4e8cfe7d151c76fe33997b2b0 100644 (file)
--- a/servers/slapd/schema/openldap.schema
+++ b/servers/slapd/schema/openldap.schema
@@ -1,4 +1,17 @@
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2009 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+
 #
 # OpenLDAP Project's directory schema items
 #
@@ -7,19 +20,35 @@
 #      cosine.schema
 #      inetorgperson.schema
 #
+# These are provided for informational purposes only.
+
+objectIdentifier OpenLDAProot 1.3.6.1.4.1.4203
+
+objectIdentifier OpenLDAP OpenLDAProot:1
+objectIdentifier OpenLDAPattributeType OpenLDAP:3
+objectIdentifier OpenLDAPobjectClass OpenLDAP:4
 
-objectClass: ( 1.3.6.1.4.1.4203.666.3.3 NAME 'OpenLDAPorg'
+objectClass ( OpenLDAPobjectClass:3
+       NAME 'OpenLDAPorg'
        DESC 'OpenLDAP Organizational Object'
-       SUP pilotOrganization 
-       MAY ( authPassword $ displayName $ labeledURI ) )
+       SUP organization
+       MAY ( buildingName $ displayName $ labeledURI ) )
 
-objectClass: ( 1.3.6.1.4.1.4203.666.3.4 NAME 'OpenLDAPperson'
+objectClass ( OpenLDAPobjectClass:4
+       NAME 'OpenLDAPou'
+       DESC 'OpenLDAP Organizational Unit Object'
+       SUP organizationalUnit
+       MAY ( buildingName $ displayName $ labeledURI $ o ) )
+
+objectClass ( OpenLDAPobjectClass:5
+       NAME 'OpenLDAPperson'
        DESC 'OpenLDAP Person'
-       SUP ( pilotPerson inetOrgPerson ) 
+       SUP ( pilotPerson $ inetOrgPerson )
        MUST ( uid $ cn )
-       MAY ( authPassword $ givenName $ labeledURI $ o $ ou ) )
+       MAY ( givenName $ labeledURI $ o ) )
 
-objectClass: ( 1.3.6.1.4.1.4203.666.3.5 NAME 'OpenLDAPdisplayableObject'
+objectClass ( OpenLDAPobjectClass:6
+       NAME 'OpenLDAPdisplayableObject'
        DESC 'OpenLDAP Displayable Object'
-       MAY displayName AUXILIARY )
-
+       AUXILIARY
+       MAY displayName )