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 04c1b485d958eb5a6ea237934e2e6919d81146d8..e69c6ab2e9122ef4e8cfe7d151c76fe33997b2b0 100644 (file)
--- a/servers/slapd/schema/openldap.schema
+++ b/servers/slapd/schema/openldap.schema
@@ -1,24 +1,54 @@
 # $OpenLDAP$
-#
-# This file contains schema items specific to OpenLDAP software.
-#
+## 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>.
 
 #
-# This file *should* only depend upon core.schema
+# OpenLDAP Project's directory schema items
 #
-
-# 
-# slapd cn=monitor items
+# depends upon:
+#      core.schema
+#      cosine.schema
+#      inetorgperson.schema
 #
+# These are provided for informational purposes only.
 
-# 
-# slapd cn=config items
-#
+objectIdentifier OpenLDAProot 1.3.6.1.4.1.4203
 
-#
-# other slapd items
-#
-attributetype ( entryOID NAME 'entry' SUP name
-      SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )
-attributetype ( childrenOID NAME 'children' SUP name
-      SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )
+objectIdentifier OpenLDAP OpenLDAProot:1
+objectIdentifier OpenLDAPattributeType OpenLDAP:3
+objectIdentifier OpenLDAPobjectClass OpenLDAP:4
+
+objectClass ( OpenLDAPobjectClass:3
+       NAME 'OpenLDAPorg'
+       DESC 'OpenLDAP Organizational Object'
+       SUP organization
+       MAY ( buildingName $ displayName $ labeledURI ) )
+
+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 )
+       MUST ( uid $ cn )
+       MAY ( givenName $ labeledURI $ o ) )
+
+objectClass ( OpenLDAPobjectClass:6
+       NAME 'OpenLDAPdisplayableObject'
+       DESC 'OpenLDAP Displayable Object'
+       AUXILIARY
+       MAY displayName )