Fix up schema per ITS#642

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 0dbbea7ea52f54174fb1d723628ab604a93544f1..6cdae496063dadbc03b9be8077356c20f53b2ace 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -179,7 +179,7 @@ attributetype ( 2.5.4.15 NAME 'businessCategory'
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
 
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
 

-attribute ( 2.5.4.16 NAME 'postalAddress'
+attributetype ( 2.5.4.16 NAME 'postalAddress'

        EQUALITY caseIgnoreListMatch
        SUBSTR caseIgnoreListSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
        EQUALITY caseIgnoreListMatch
        SUBSTR caseIgnoreListSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )

diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema
index 798606ab17844e3d13fca3331a35750f3c1f9b76..151b24870cef1e310e5b66967859bc3d26eca38d 100644 (file)
--- a/servers/slapd/schema/misc.schema
+++ b/servers/slapd/schema/misc.schema
@@ -8,14 +8,14 @@ attributetype ( 2.16.840.1.113730.3.1.13
        NAME 'mailLocalAddress'
        DESC 'RFC822 email address of this recipient'
        EQUALITY caseIgnoreIA5Match
        NAME 'mailLocalAddress'
        DESC 'RFC822 email address 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} )

 
 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
 
 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
        SINGLE-VALUE )
 
 attributetype ( 2.16.840.1.113730.3.1.47


@@ -23,12 +23,12 @@ attributetype ( 2.16.840.1.113730.3.1.47
        DESC 'RFC822 address to use when routing messages to 
                the SMTP MTA of this recipient'
        EQUALITY caseIgnoreIA5Match
        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}'
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}

        SINGLE-VALUE )
 
 objectclass ( 2.16.840.1.113730.3.2.TBD
        NAME 'inetLocalMailRecipient'
        DESC 'Internet local mail recipient'
        SUP top AUXILIARY
        SINGLE-VALUE )
 
 objectclass ( 2.16.840.1.113730.3.2.TBD
        NAME 'inetLocalMailRecipient'
        DESC 'Internet local mail recipient'
        SUP top AUXILIARY

-       MAY     ( mailLocalAddress $ mailHost $ mailRoutingAddress )
+       MAY     ( mailLocalAddress $ mailHost $ mailRoutingAddress ) )