Clarify schema source, status, and provide appropriate caution

diff --git a/servers/slapd/schema/README b/servers/slapd/schema/README
index f3a4d6d0730701796c7169452676ec10a2aaece5..2f89713c28c986939f51f2d14234a41dc4708fb3 100644 (file)
--- a/servers/slapd/schema/README
+++ b/servers/slapd/schema/README
@@ -4,20 +4,21 @@ with slapd(8).
 File                    Description
 ----                    -----------
 collective.schema       Collective attributes (experimental)
-corba.schema            Corba Object (RFC 2714)
+corba.schema            Corba Object
 core.schema             OpenLDAP "core"
 cosine.schema           COSINE Pilot
-duaconf.schema          Client Configuration (experimental)
+duaconf.schema          Client Configuration (work in progress)
+dyngroup.schema                        Dynamic Group (experimental)
 inetorgperson.schema    InetOrgPerson
-java.schema             Java Object (RFC 2713)
+java.schema             Java Object
 microsoft.ext.schema    Microsoft (FYI)
 microsoft.schema        Microsoft (FYI)
 microsoft.std.schema    Microsoft (FYI)
 misc.schema             Miscellaneous Schema (experimental)
 nadf.schema             North American Directory Forum (obsolete)
-nis.schema              Network Information Service
+nis.schema              Network Information Service (experimental)
 openldap.schema         OpenLDAP Project (FYI)
-ppolicy.schema          Password Policy Schema (experimental)
+ppolicy.schema          Password Policy Schema (work in progress)
 
 Additional "generally useful" schema definitions can be submitted
 using the OpenLDAP Issue Tracking System <http://www.openldap.org/its/>.

diff --git a/servers/slapd/schema/collective.schema b/servers/slapd/schema/collective.schema
index d8bb81747cad2d222e27407a636af60c6ab7e3de..2b85761e0e37f6f5c27640fe8de1faff5a809243 100644 (file)
--- a/servers/slapd/schema/collective.schema
+++ b/servers/slapd/schema/collective.schema
@@ -17,7 +17,7 @@
 ## Please see full copyright statement below.
 
 # From RFC 3671 [portions trimmed]:
-#                      Collective Attributes in LDAP
+#      Collective Attributes in LDAP
 
 #Abstract
 #

diff --git a/servers/slapd/schema/duaconf.schema b/servers/slapd/schema/duaconf.schema
index e97c33ba719705f3200678318bafdc9cadd45577..21ff6f526af52505abf4bf19232f6f4aa963c329 100644 (file)
--- a/servers/slapd/schema/duaconf.schema
+++ b/servers/slapd/schema/duaconf.schema
@@ -12,6 +12,14 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+# DUA schema from draft-joslin-config-schema (a work in progress)
+
+# Contents of this file are subject to change (including deletion)
+# without notice.
+#
+# Not recommended for production use!
+# Use with extreme caution!
+
 ## Notes:
 ## - The matching rule for attributes followReferrals and dereferenceAliases
 ##   has been changed to booleanMatch since their syntax is boolean

diff --git a/servers/slapd/schema/dyngroup.schema b/servers/slapd/schema/dyngroup.schema
index 02ebafb74ab47fde6d09441fcaf09c43a0349f42..d0b955fd39abf74c2b40f1ede4cb9d2242265033 100644 (file)
--- a/servers/slapd/schema/dyngroup.schema
+++ b/servers/slapd/schema/dyngroup.schema
@@ -13,10 +13,17 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 #
-# Dynamic Group schema, as defined by Netscape
+# Dynamic Group schema (experimental), as defined by Netscape.  See
+# http://enterprise.netscape.com/docs/enterprise/60/admin/esusrgrp.htm#1019520
+# for details.
 #
 # depends upon:
 #      core.schema
+#
+# These definitions are considered experimental due to the lack of
+# a formal specification (e.g., RFC).
+#
+# Not recommended for production use!  Use with caution!
 
 objectIdentifier NetscapeRoot 2.16.840.1.113730
 

diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema
index f71d7f397e91871cb318d2216ea8012d492848c8..00ea6711b66bf743aabd2924756c0488609a2fbe 100644 (file)
--- a/servers/slapd/schema/misc.schema
+++ b/servers/slapd/schema/misc.schema
@@ -21,8 +21,8 @@
 # Use with extreme caution!
 
 #-----------------------------------------------------------
-#
 # draft-lachman-laser-ldap-mail-routing-02.txt !!!EXPIRED!!!
+#      (a work in progress)
 #
 attributetype ( 2.16.840.1.113730.3.1.13
        NAME 'mailLocalAddress'
@@ -54,8 +54,8 @@ objectclass ( 2.16.840.1.113730.3.2.147
        MAY     ( mailLocalAddress $ mailHost $ mailRoutingAddress ) )
 
 #-----------------------------------------------------------
-#
 # draft-srivastava-ldap-mail-00.txt !!!EXPIRED!!!
+#      (a work in progress)
 #
 attributetype ( 1.3.6.1.4.1.42.2.27.2.1.15
        NAME 'rfc822MailMember'
@@ -64,8 +64,8 @@ attributetype ( 1.3.6.1.4.1.42.2.27.2.1.15
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
 #-----------------------------------------------------------
-# 
 # !!!no I-D!!!
+#      (a work in progress)
 #
 objectclass ( 1.3.6.1.4.1.42.2.27.1.2.5
        NAME 'nisMailAlias'

diff --git a/servers/slapd/schema/ppolicy.schema b/servers/slapd/schema/ppolicy.schema
index e99e5c660733225d0abe51dbcc122adc595a141e..8368e44890d9217b5622a058876a3466e6c2fd81 100644 (file)
--- a/servers/slapd/schema/ppolicy.schema
+++ b/servers/slapd/schema/ppolicy.schema
@@ -15,13 +15,17 @@
 ## Portions Copyright (C) The Internet Society (2004).  All Rights Reserved.
 ## Please see full copyright statement below.
 
-# Definitions from Draft behera-ldap-password-policy-07
+# Definitions from Draft behera-ldap-password-policy-07 (a work in progress)
 #      Password Policy for LDAP Directories
-
 # With extensions from Hewlett-Packard:
 #      pwdCheckModule etc.
 
-# 
+# Contents of this file are subject to change (including deletion)
+# without notice.
+#
+# Not recommended for production use!
+# Use with extreme caution!
+
 # Internet-Draft                                                P. Behera
 # draft behera-ldap-password-policy-07.txt                      L. Poitou
 # Intended Category: Proposed Standard                   Sun Microsystems