changes based upon draft-lachman-laser-ldap-mail-routing-00.txt

diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema
index 94bf78f583647df17e2d9a1b0724284cb0c9c947..f5888e5d0dc6358909c944243b62dda344c64ac6 100644 (file)
--- a/servers/slapd/schema/misc.schema
+++ b/servers/slapd/schema/misc.schema
@@ -5,28 +5,34 @@
 #
 
 #
-# draft-lachman-ldap-mail-routing-03.txt
+# 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'
        EQUALITY caseIgnoreIA5Match
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
        SINGLE-VALUE )
 
 attribute ( 2.16.840.1.113730.3.1.18 NAME 'mailHost'
        DESC 'alternate RFC 822 email address of this recipient' 
        EQUALITY caseIgnoreIA5Match
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+       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 )
+       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'
        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 )
+
 
 #
 # RFC2247

diff --git a/servers/slapd/schema/pilot.schema b/servers/slapd/schema/pilot.schema
index 2a205798b246b2c1d31aa666e785497d1193c548..62c5b32d325cdd216e015824340fd083123ddf4f 100644 (file)
--- a/servers/slapd/schema/pilot.schema
+++ b/servers/slapd/schema/pilot.schema
@@ -31,7 +31,7 @@ attribute ( 0.9.2342.19200300.100.1.2 NAME 'textEncodedORAddress'
 
 attribute ( 0.9.2342.19200300.100.1.3 NAME ( 'mail' 'rfc822Mailbox' )
        EQUALITY caseIgnoreIA5Match
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
 
 attribute ( 0.9.2342.19200300.100.1.4 NAME 'info' EQUALITY caseIgnoreMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )