X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema%2Fmisc.schema;h=923091a6eb668d9088000310dd9964e0f293a72e;hb=6661a26e9bc2f2fa8dd14f573a9d72acd0c5bfae;hp=1ad862e2876d932ae2eabc1e6232d442908a6ed5;hpb=0136c5f88fc79546a9ef6f592e1500dbc2b4d2cf;p=openldap
diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema
index 1ad862e287..923091a6eb 100644
--- a/servers/slapd/schema/misc.schema
+++ b/servers/slapd/schema/misc.schema
@@ -1,54 +1,75 @@
+# misc.schema -- assorted schema definitions
# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## 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
+## .
#
-# 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-02.txt !!!EXPIRED!!!
+# (a work in progress)
#
-# draft-lachman-laser-ldap-mail-routing-00.txt
-#
-attribute ( 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} )
-attribute ( 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 )
-attribute ( 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 ) )
+#-----------------------------------------------------------
+# draft-srivastava-ldap-mail-00.txt !!!EXPIRED!!!
+# (a work in progress)
#
-# 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 )
-
+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)
#
-# 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 )
-
-
-# Origin of this has not been identified. We had it and Netscape has it
-# too.
-attribute ( 1.3.6.1.4.1.250.1.60 NAME ( 'timeToLive' 'ttl' )
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-objectclass ( 1.3.6.1.4.1.250.3.18 NAME 'cacheObject' SUP top MAY ttl )
+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 )