From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 17 May 2000 02:32:37 +0000 (+0000)
Subject: Update to based upon rev1 of lachman laser
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2936
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bb4ee30aa27498d386ca23cea5635b83ae226f76;p=openldap

Update to based upon rev1 of lachman laser
---

diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema
index 870bbb19e6..0a6ac6855e 100644
--- a/servers/slapd/schema/misc.schema
+++ b/servers/slapd/schema/misc.schema
@@ -5,33 +5,31 @@
 #
 
 #
-# draft-lachman-laser-ldap-mail-routing-00.txt
+# draft-lachman-laser-ldap-mail-routing-01.txt
 #
-attributetype ( 2.16.840.1.113730.3.1.13 NAME 'mailAlternateAddress'
+attributetype ( 2.16.840.1.113730.3.1.13
+	NAME 'mailLocalAddress'
 	DESC 'RFC 822 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 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+attributetype ( 2.16.840.1.113730.3.1.47
+	NAME 'mailRoutingAddress'
+	DESC 'RFC 822 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'
 	SUP top AUXILIARY
-	MAY	( cn $ mail $ mailAlternateAddress $ mailHost $ mailRoutingAddress ))
-
-# Needs an OID
-#objectclass ( 2.16.840.1.113730.3.2.[[TBD]] NAME 'inetLocalMailRecipient'
-#	SUP top AUXILIARY
-#	MAY	( mail $ mailAlternateAddress $ mailHost $ mailRoutingAddress )
-
+	MAY	( mailLocalAddress $ mailHost $ mailRoutingAddress )