From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 26 Aug 2000 20:24:52 +0000 (+0000)
Subject: Misc schema clarifications
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2167
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8ef285f854170ecd4ab164c756253d0fb3d753d1;p=openldap

Misc schema clarifications
---

diff --git a/servers/slapd/schema/cosine.schema b/servers/slapd/schema/cosine.schema
index ff2d9f9811..4dfa170e3e 100644
--- 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 2589c36029..c40720f4c0 100644
--- 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 dc88d20914..a5b8f20689 100644
--- 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 391b86dd9f..464e04eab5 100644
--- 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 05e9552af7..3f3305d858 100644
--- 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 )
-
-
-
-