X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fschema%2Fmisc.schema;h=089050c9c549314ff1a4a78d409b36a9f6a5faaa;hb=5f7bf65debcd71dda50c6c329cbd3e78cac74e8f;hp=870bbb19e616b2d347351270cc3e3350a4b78df5;hpb=318a116910f5f1c5d2c4869eb18796c0b380e4ec;p=openldap

diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema
index 870bbb19e6..089050c9c5 100644
--- a/servers/slapd/schema/misc.schema
+++ b/servers/slapd/schema/misc.schema
@@ -1,37 +1,57 @@
 # $OpenLDAP$
 #
-# Assorted definitions from several sources
-#	depends on core.schema and pilot.schema
+# Assorted definitions from several sources, including
+# ''works in progress''.  Use with extreme care.  May
+# be subject to change.
 #
 
 #
-# draft-lachman-laser-ldap-mail-routing-00.txt
+# draft-lachman-laser-ldap-mail-routing-02.txt
 #
-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 'fully-qualified hostname of the MTA that is the final 
+		SMTP destination of messages to 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 address to use when routing messages to 
+		the SMTP MTA 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'
+objectclass ( 2.16.840.1.113730.3.2.TBD
+	NAME 'inetLocalMailRecipient'
+	DESC 'Internet local mail recipient'
 	SUP top AUXILIARY
-	MAY	( cn $ mail $ mailAlternateAddress $ mailHost $ mailRoutingAddress ))
+	MAY	( mailLocalAddress $ mailHost $ mailRoutingAddress ) )
 
-# Needs an OID
-#objectclass ( 2.16.840.1.113730.3.2.[[TBD]] NAME 'inetLocalMailRecipient'
-#	SUP top AUXILIARY
-#	MAY	( mail $ mailAlternateAddress $ mailHost $ mailRoutingAddress )
 
+#
+# draft-srivastava-ldap-mail-00.html
+#   !!!EXPIRED!!!
+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 )