From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 8 Jan 2002 21:19:06 +0000 (+0000)
Subject: Schema updates from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_0_20~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=586fac9c544376ab982393711cfc7cfb1e64f954;p=thirdparty%2Fopenldap.git

Schema updates from HEAD
---

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 908aec2b09..0ac410b471 100644
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -452,6 +452,13 @@ objectclass ( 1.3.6.1.4.1.1466.101.120.111 NAME 'extensibleObject'
 	DESC 'RFC2252: extensible object'
 	SUP top AUXILIARY )
 
+objectclass ( 2.5.20.1 NAME 'subschema'
+	DESC 'RFC2252: controlling subschema (sub)entry'
+	AUXILIARY
+	MAY ( dITStructureRules $ nameForms $ ditContentRules $
+		objectClasses $ attributeTypes $ matchingRules $
+		matchingRuleUse ) )
+
 #
 # Standard Track URI label schema from RFC2079
 #
@@ -539,8 +546,9 @@ objectclass ( 2.16.840.1.113730.3.2.6 NAME 'referral'
 
 #
 # LDAPsubEntry
-#	likely to change!
-objectclass ( 2.16.840.1.113719.2.142.6.1.1 NAME 'LDAPsubEntry'
+#	deprecated!
+objectclass ( 2.16.840.1.113719.2.142.6.1.1
+	NAME 'LDAPsubEntry'
 	DESC 'LDAP Subentry'
 	SUP top STRUCTURAL MAY cn )
 
diff --git a/servers/slapd/schema/cosine.schema b/servers/slapd/schema/cosine.schema
index c71488c25b..c6babcc2ef 100644
--- a/servers/slapd/schema/cosine.schema
+++ b/servers/slapd/schema/cosine.schema
@@ -395,8 +395,11 @@ attributetype ( 0.9.2342.19200300.100.1.22 NAME 'otherMailbox'
 #    ::= {pilotAttributeType 23}
 #
 ## OBSOLETE
-attributetype ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime'
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.53 )
+#attributetype ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime'
+#	DESC 'RFC1274: time of last modify, replaced by modifyTimestamp'
+#	OBSOLETE
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.53
+#	USAGE directoryOperation )
 
 # 9.3.20.  Last Modified By
 #
@@ -411,9 +414,12 @@ attributetype ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime'
 #
 
 ## OBSOLETE
-attributetype ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy'
-	EQUALITY distinguishedNameMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+#attributetype ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy'
+#	DESC 'RFC1274: last modifier, replaced by modifiersName'
+#	OBSOLETE
+#	EQUALITY distinguishedNameMatch
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+#	USAGE directoryOperation )
 
 # 9.3.21.  Domain Component
 #
diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema
index 7be7b46fa8..87604308ff 100644
--- a/servers/slapd/schema/misc.schema
+++ b/servers/slapd/schema/misc.schema
@@ -1,11 +1,14 @@
 # $OpenLDAP$
 #
 # Assorted definitions from several sources, including
-# ''works in progress''.  Use with extreme caution!
-# May be subject to change (or removal) without notice.
+# ''works in progress''.  Contents of this file are
+# subject to change (including deletion) without notice.
+#
+# Not recommended for production use!
+# Use with extreme caution!
 
 #
-# draft-lachman-laser-ldap-mail-routing-02.txt
+# draft-lachman-laser-ldap-mail-routing-02.txt !!!EXPIRED!!!
 #
 attributetype ( 2.16.840.1.113730.3.1.13
 	NAME 'mailLocalAddress'
@@ -15,16 +18,14 @@ attributetype ( 2.16.840.1.113730.3.1.13
 
 attributetype ( 2.16.840.1.113730.3.1.18
 	NAME 'mailHost'
-	DESC 'fully-qualified hostname of the MTA that is the final 
-		SMTP destination of messages to this recipient'
+	DESC 'FQDN of the SMTP/MTA of this recipient'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
 	SINGLE-VALUE )
 
 attributetype ( 2.16.840.1.113730.3.1.47
 	NAME 'mailRoutingAddress'
-	DESC 'RFC822 address to use when routing messages to 
-		the SMTP MTA of this recipient'
+	DESC 'RFC822 routing address of this recipient'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
 	SINGLE-VALUE )
@@ -36,9 +37,17 @@ attributetype ( 2.16.840.1.113730.3.1.47
 #	SUP top AUXILIARY
 #	MAY	( mailLocalAddress $ mailHost $ mailRoutingAddress ) )
 
+# I-D leaves this OID TBD.
+# iPlanet uses 2.16.840.1.113.730.3.2.147 but that appears to be
+# an improperly delegated OID.  A typo is suspected.
+objectclass ( 2.16.840.1.113730.3.2.147
+	NAME 'inetLocalMailRecipient'
+	DESC 'Internet local mail recipient'
+	SUP top AUXILIARY
+	MAY	( mailLocalAddress $ mailHost $ mailRoutingAddress ) )
 
 #
-# draft-srivastava-ldap-mail-00.html !!!EXPIRED!!!
+# draft-srivastava-ldap-mail-00.txt !!!EXPIRED!!!
 #
 attributetype ( 1.3.6.1.4.1.42.2.27.2.1.15
 	NAME 'rfc822MailMember'