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 42e1757f8ac51ec097959d380279bc06bbb2f0c9..ef779d5d55fc4ec10ee250f0167cb4e99e59538f 100644 (file)
--- a/servers/slapd/schema/misc.schema
+++ b/servers/slapd/schema/misc.schema
@@ -1,47 +1,62 @@
 # $OpenLDAP$
 #
-# Assorted definitions from several sources
-#      depends on core.schema and pilot.schema
+# Assorted definitions from several sources, including
+# ''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-00.txt
+# draft-lachman-laser-ldap-mail-routing-02.txt !!!EXPIRED!!!
 #
-attributetype ( 2.16.840.1.113730.3.1.13 NAME 'mailAlternateAddress'
-       DESC 'RFC 822 email address of this recipient'
+attributetype ( 2.16.840.1.113730.3.1.13
+       NAME 'mailLocalAddress'
+       DESC 'RFC822 email address of this recipient'
        EQUALITY caseIgnoreIA5Match
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-       SINGLE-VALUE )
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
-attributetype ( 2.16.840.1.113730.3.1.18 NAME 'mailHost'
-       DESC 'alternate RFC 822 email address of this recipient' 
+attributetype ( 2.16.840.1.113730.3.1.18
+       NAME 'mailHost'
+       DESC 'FQDN of the SMTP/MTA of this recipient'
        EQUALITY caseIgnoreIA5Match
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} 
+       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 'fully qualified hostname of the SMTP MTA that handles messages for this recipient' 
-       EQUALITY caseIgnoreIA5Match 
+attributetype ( 2.16.840.1.113730.3.1.47
+       NAME 'mailRoutingAddress'
+       DESC 'RFC822 routing address of this recipient'
+       EQUALITY caseIgnoreIA5Match
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
        SINGLE-VALUE )
 
-objectclass ( 2.16.840.1.113730.3.2.3 NAME 'mailRecipient'
+# 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     ( cn $ mail $ mailAlternateAddress $ mailHost $ mailRoutingAddress ))
-
-#objectclass ( 2.16.840.1.113730.3.2.[[TBD]] NAME 'inetLocalMailRecipient'
-#      SUP top AUXILIARY
-#      MAY     ( mail $ mailAlternateAddress $ mailHost $ mailRoutingAddress )
-
+       MAY     ( mailLocalAddress $ mailHost $ mailRoutingAddress ) )
 
+#-----------------------------------------------------------
 #
-# RFC2247
-#      This may need to be moved to core.schema
-objectclass ( 1.3.6.1.4.1.1466.344 NAME 'dcObject' SUP top AUXILIARY MUST dc )
-
-
+# draft-srivastava-ldap-mail-00.txt !!!EXPIRED!!!
 #
-# RFC2377
-#      This may need to be moved to core.schema
-objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject' SUP top AUXILIARY MUST uid )
+attributetype ( 1.3.6.1.4.1.42.2.27.2.1.15
+       NAME 'rfc822MailMember'
+       DESC 'rfc822 mail address of group member(s)'
+       EQUALITY caseIgnoreIA5Match
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
+#-----------------------------------------------------------
+# 
+# !!!no I-D!!!
+#
+objectclass ( 1.3.6.1.4.1.42.2.27.1.2.5
+       NAME 'nisMailAlias'
+       DESC 'NIS mail alias'
+       SUP top STRUCTURAL
+       MUST cn
+       MAY rfc822MailMember )