Import schema updates/clarifications from devel

diff --git a/servers/slapd/schema/README b/servers/slapd/schema/README
new file mode 100644 (file)
index 0000000..dfcd070
--- /dev/null
+++ b/servers/slapd/schema/README
@@ -0,0 +1,21 @@
+This directory contains schema definitions for use with slapd(5).
+
+File                    Description
+----                    -----------
+core.schema             OpenLDAP "core"
+cosine.schema           COSINE Pilot schema
+inetorgperson.schema    InetOrgPerson schema
+microsoft.ext.schema    Microsoft schema
+microsoft.schema        Microsoft schema
+microsoft.std.schema    Microsoft schema
+misc.schema             misc. schema
+nadf.schema             North America Directory Forum schema
+nis.schema              Network Information Service schema
+openldap.schema         OpenLDAP Project schema
+pilot.schema            old Pilot schema
+
+Additional schema definitions can be submitted using the OpenLDAP
+Issue Tracking System <http://www.openldap.org/its/>.
+
+---
+$OpenLDAP$

diff --git a/servers/slapd/schema/cosine.schema b/servers/slapd/schema/cosine.schema
index ff2d9f98118f141f83ca5b099974529937df1f19..4dfa170e3e91fedb3c5ac6e2ca1bce3cc46aa276 100644 (file)
--- a/servers/slapd/schema/cosine.schema
+++ b/servers/slapd/schema/cosine.schema
@@ -8,8 +8,6 @@
 # mappings were based upon: draft-ietf-asid-ldapv3-attributes-03.txt
 # (a work in progress)
 #
-# It may be best to avoid use this schema.
-#
 # Note: It seems that the pilot schema evolved beyond what was
 # described in RFC1274.  However, this document attempts to describes
 # RFC1274 as published. 

diff --git a/servers/slapd/schema/inetorgperson.schema b/servers/slapd/schema/inetorgperson.schema
index 2589c3602919d7b5f6ae52dee33cd3d28eaa7caf..c40720f4c0e4f8d02bd1d160c32291b508658273 100644 (file)
--- a/servers/slapd/schema/inetorgperson.schema
+++ b/servers/slapd/schema/inetorgperson.schema
@@ -1,10 +1,8 @@
 # $OpenLDAP$
 #
-# InetOrgPerson (RFC 2798)
+# InetOrgPerson (RFC2798)
 #
 # Depends upon
-#   The COSINE and Internet X.500 Schema [RFC1274]
-#   
 #   Definition of an X.500 Attribute Type and an Object Class to Hold
 #   Uniform Resource Identifiers (URIs) [RFC2079]
 #      (core.schema)
@@ -12,9 +10,8 @@
 #   A Summary of the X.500(96) User Schema for use with LDAPv3 [RFC2256]
 #      (core.schema)
 #
-#   and X.500 pilot schema
+#   The COSINE and Internet X.500 Schema [RFC1274] (cosine.schema)
    
-
 # carLicense
 # This multivalued field is used to record the values of the license or
 # registration plate associated with an individual.

diff --git a/servers/slapd/schema/nadf.schema b/servers/slapd/schema/nadf.schema
index dc88d20914c53e700b2b09ceb9a9829ea102010a..a5b8f20689463d1347e3c05087d8293f5c8b8acf 100644 (file)
--- a/servers/slapd/schema/nadf.schema
+++ b/servers/slapd/schema/nadf.schema
@@ -4,9 +4,6 @@
 # They were taken from ftp://ftp.gte.com/pub/nadf/nadf-docs/sd-04.ps
 # Our thanks to Harald T. Alvestrand that provided the pointer.
 
-# Some attribute types and object classes defined in the spec
-# and that we did not have are not included in this file.
-
 # This is a preliminary version and is likely to be incorrect in
 # a number of areas
 

diff --git a/servers/slapd/schema/openldap.schema b/servers/slapd/schema/openldap.schema
index 391b86dd9ffa74eaaa11e2684f80909a9b058c93..464e04eab532523f18969084f623d4a6e617c9aa 100644 (file)
--- a/servers/slapd/schema/openldap.schema
+++ b/servers/slapd/schema/openldap.schema
@@ -7,6 +7,7 @@
 #      cosine.schema
 #      inetorgperson.schema
 #
+# These are provided for informational purposes only.
 
 objectClass ( 1.3.6.1.4.1.4203.1.4.3 NAME 'OpenLDAPorg'
        DESC 'OpenLDAP Organizational Object'

diff --git a/servers/slapd/schema/pilot.schema b/servers/slapd/schema/pilot.schema
index 05e9552af780098983cf6ab8fbad457c0248ade4..3f3305d858902c2e3341991a93fe9b39adeff96f 100644 (file)
--- a/servers/slapd/schema/pilot.schema
+++ b/servers/slapd/schema/pilot.schema
@@ -1,5 +1,8 @@
 # $OpenLDAP$
 
+# DO NOT USE THESE DEFINITIONS
+# use cosine.schema instead!
+
 # These come from RFC1274 and are in ASN.1 syntax.  They have been
 # translated with some imagination.  Only attributes and classes we
 # already had are here.  In general, the matching rules in the
@@ -353,7 +356,3 @@ objectclass ( 0.9.2342.19200300.100.4.19 NAME 'simpleSecurityObject'
 
 objectclass ( 0.9.2342.19200300.100.4.20 NAME 'pilotOrganization'
        SUP ( organization $ organizationalUnit ) MAY buildingName )
-
-
-
-