ITS#2607: improve socket() error logging with AF info

[openldap] / servers / slapd / schema / misc.schema

diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema
index 0ea32a4e0cb1ddf87a80ee9124ac65b2175ac0f4..ef779d5d55fc4ec10ee250f0167cb4e99e59538f 100644 (file)
--- a/servers/slapd/schema/misc.schema
+++ b/servers/slapd/schema/misc.schema
@@ -1,12 +1,15 @@
 # $OpenLDAP$
 #
 # Assorted definitions from several sources, including
-# ''works in progress''.  Use with extreme care.  May
-# be subject to change.
+# ''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'
@@ -16,30 +19,30 @@ 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 )
 
-# OID needs to be determined
-#objectclass ( 2.16.840.1.113730.3.2.TBD
-#      NAME 'inetLocalMailRecipient'
-#      DESC 'Internet local mail recipient'
-#      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 is an
+# improperly delegated OID.  A typo is likely.
+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'
@@ -47,6 +50,7 @@ attributetype ( 1.3.6.1.4.1.42.2.27.2.1.15
        EQUALITY caseIgnoreIA5Match
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
+#-----------------------------------------------------------
 # 
 # !!!no I-D!!!
 #