Happy new year! (belated)

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

diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema
index 151b24870cef1e310e5b66967859bc3d26eca38d..923091a6eb668d9088000310dd9964e0f293a72e 100644 (file)
--- a/servers/slapd/schema/misc.schema
+++ b/servers/slapd/schema/misc.schema
@@ -1,8 +1,28 @@
+# misc.schema -- assorted schema definitions
 # $OpenLDAP$
-# Assorted definitions from several sources
-
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2008 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+#
+# Assorted definitions from several sources, including
+# ''works in progress''.  Contents of this file are
+# subject to change (including deletion) without notice.
 #
-# draft-lachman-laser-ldap-mail-routing-01.txt
+# Not recommended for production use!
+# 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'
@@ -12,23 +32,44 @@ 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 )
 
-objectclass ( 2.16.840.1.113730.3.2.TBD
+# 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.txt !!!EXPIRED!!!
+#      (a work in progress)
+#
+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!!!
+#      (a work in progress)
+#
+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 )