Update pilot schema based upon asid ldapv3-attributes I-D.

Add needed syntaxes defs to schema_init.c

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 68faca961e295795abf3ac78aa4a75033e3b1fb4..40b7bf0bcc6e968ba0888392386cdcb2cc13c67c 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -525,11 +525,12 @@ attributetype ( 1.3.6.1.4.1.1466.101.119.4 NAME 'dynamicSubtrees'
        USAGE dSAOperation )
 
 # Derived from RFC1274, but with new "short names"
-attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' )
+attributetype ( 0.9.2342.19200300.100.1.1
+       NAME ( 'uid' 'userid' )
        DESC 'RFC1274 user identifier'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       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} )
 
 attributetype ( 0.9.2342.19200300.100.1.3 NAME ( 'mail' 'rfc822Mailbox' )
        DESC 'rfc822 mail box'

diff --git a/servers/slapd/schema/cosine.schema b/servers/slapd/schema/cosine.schema
index 0d7779a75203e30492a97f57b0a55f4f5d25ef1b..8d5ef0db3325a74016ea47f7fd603764ee3053e1 100644 (file)
--- a/servers/slapd/schema/cosine.schema
+++ b/servers/slapd/schema/cosine.schema
@@ -4,10 +4,9 @@
 #
 # This file contains LDAPv3 schema derived from X.500 "pilot"
 # schema.  As this schema was defined for X.500(89), some
-# oddities were introduced in the mapping to LDAPv3.
-#
-# The syntax and matching rules of attribute types listed may be
-# incomplete or otherwise incorrect.
+# oddities were introduced in the mapping to LDAPv3.  The
+# mappings were based upon: draft-ietf-asid-ldapv3-attributes-03.txt
+# (a work in progress)
 #
 # It may be best to avoid use this schema.
 #
@@ -94,8 +93,10 @@
 #    ::= {pilotAttributeType 1}
 #
 #(in core.schema)
-##attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'userid' $ 'uid' )
-##     SUP 'name' )
+##attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' )
+##     EQUALITY caseIgnoreMatch
+##     SUBSTR caseIgnoreSubstringsMatch
+##     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
 
 # 9.3.2.  Text Encoded O/R Address
 #
@@ -114,7 +115,7 @@
 attributetype ( 0.9.2342.19200300.100.1.2 NAME 'textEncodedORAddress'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       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} )
 
 # 9.3.3.  RFC 822 Mailbox
 #
@@ -130,7 +131,7 @@ attributetype ( 0.9.2342.19200300.100.1.2 NAME 'textEncodedORAddress'
 #    ::= {pilotAttributeType 3}
 #
 #(in core.schema)
-##attributetype ( 0.9.2342.19200300.100.1.3 NAME ( 'rfc822Mailbox' 'mail' )
+##attributetype ( 0.9.2342.19200300.100.1.3 NAME ( 'mail' 'rfc822Mailbox' )
 ##     EQUALITY caseIgnoreIA5Match
 ##     SUBSTR caseIgnoreIA5SubstringsMatch
 ##     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
@@ -151,7 +152,7 @@ attributetype ( 0.9.2342.19200300.100.1.2 NAME 'textEncodedORAddress'
 attributetype ( 0.9.2342.19200300.100.1.4 NAME 'info'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{2048} )
 
 
 # 9.3.5.  Favourite Drink
@@ -165,10 +166,11 @@ attributetype ( 0.9.2342.19200300.100.1.4 NAME 'info'
 #            (SIZE (1 .. ub-favourite-drink))
 #    ::= {pilotAttributeType 5}
 #
-attributetype ( 0.9.2342.19200300.100.1.5 NAME ( 'favouriteDrink' )
+attributetype ( 0.9.2342.19200300.100.1.5
+       NAME ( 'drink' 'favouriteDrink' )
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       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} )
 
 # 9.3.6.  Room Number
 #
@@ -185,7 +187,7 @@ attributetype ( 0.9.2342.19200300.100.1.5 NAME ( 'favouriteDrink' )
 attributetype ( 0.9.2342.19200300.100.1.6 NAME 'roomNumber'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       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} )
 
 # 9.3.7.  Photo
 #
@@ -206,7 +208,7 @@ attributetype ( 0.9.2342.19200300.100.1.6 NAME 'roomNumber'
 #    ::= {pilotAttributeType 7}
 #
 attributetype ( 0.9.2342.19200300.100.1.7 NAME 'photo'
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.23{25000} )
 
 # 9.3.8.  User Class
 #
@@ -226,7 +228,7 @@ attributetype ( 0.9.2342.19200300.100.1.7 NAME 'photo'
 attributetype ( 0.9.2342.19200300.100.1.8 NAME 'userClass'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       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} )
 
 # 9.3.9.  Host
 #
@@ -241,7 +243,7 @@ attributetype ( 0.9.2342.19200300.100.1.8 NAME 'userClass'
 attributetype ( 0.9.2342.19200300.100.1.9 NAME 'host'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       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} )
 
 # 9.3.10.  Manager
 #
@@ -271,7 +273,7 @@ attributetype ( 0.9.2342.19200300.100.1.10 NAME 'manager'
 attributetype ( 0.9.2342.19200300.100.1.11 NAME 'documentIdentifier'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       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} )
 
 # 9.3.12.  Document Title
 #
@@ -286,7 +288,7 @@ attributetype ( 0.9.2342.19200300.100.1.11 NAME 'documentIdentifier'
 attributetype ( 0.9.2342.19200300.100.1.12 NAME 'documentTitle'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       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} )
 
 # 9.3.13.  Document Version
 #
@@ -302,7 +304,7 @@ attributetype ( 0.9.2342.19200300.100.1.12 NAME 'documentTitle'
 attributetype ( 0.9.2342.19200300.100.1.13 NAME 'documentVersion'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       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} )
 
 # 9.3.14.  Document Author
 #
@@ -332,7 +334,7 @@ attributetype ( 0.9.2342.19200300.100.1.14 NAME 'documentAuthor'
 attributetype ( 0.9.2342.19200300.100.1.15 NAME 'documentLocation'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       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} )
 
 # 9.3.16.  Home Telephone Number
 #
@@ -346,7 +348,8 @@ attributetype ( 0.9.2342.19200300.100.1.15 NAME 'documentLocation'
 #            telephoneNumberSyntax
 #    ::= {pilotAttributeType 20}
 #
-attributetype ( 0.9.2342.19200300.100.1.20 NAME ( 'homeTelephoneNumber' 'homePhone' )
+attributetype ( 0.9.2342.19200300.100.1.20
+       NAME ( 'homePhone' 'homeTelephoneNumber' )
        EQUALITY telephoneNumberMatch
        SUBSTR telephoneNumberSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
@@ -392,6 +395,7 @@ attributetype ( 0.9.2342.19200300.100.1.22 NAME 'otherMailbox'
 #            uTCTimeSyntax
 #    ::= {pilotAttributeType 23}
 #
+## OBSOLETE
 attributetype ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.53 )
 
@@ -407,6 +411,7 @@ attributetype ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime'
 #    ::= {pilotAttributeType 24}
 #
 
+## OBSOLETE
 attributetype ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy'
        EQUALITY distinguishedNameMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
@@ -423,7 +428,7 @@ attributetype ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy'
 #    ::= {pilotAttributeType 25}
 #
 ##(in core.schema)
-##attributetype ( 0.9.2342.19200300.100.1.25 NAME 'dc'
+##attributetype ( 0.9.2342.19200300.100.1.25 NAME ( 'dc' 'domainComponent' )
 ##     EQUALITY caseIgnoreIA5Match
 ##     SUBSTR caseIgnoreIA5SubstringsMatch
 ##     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
@@ -438,13 +443,16 @@ attributetype ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy'
 #            DNSRecordSyntax
 #    ::= {pilotAttributeType 26}
 #
-## incorrect syntax!!
+## incorrect syntax?
 attributetype ( 0.9.2342.19200300.100.1.26 NAME 'aRecord'
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+       EQUALITY caseIgnoreIA5Match
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
 ## missing from RFC1274
+## incorrect syntax?
 attributetype ( 0.9.2342.19200300.100.1.27 NAME 'mDRecord'
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+       EQUALITY caseIgnoreIA5Match
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
 # 9.3.23.  MX Record
 #
@@ -458,7 +466,8 @@ attributetype ( 0.9.2342.19200300.100.1.27 NAME 'mDRecord'
 #
 ## incorrect syntax!!
 attributetype ( 0.9.2342.19200300.100.1.28 NAME 'mXRecord'
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+       EQUALITY caseIgnoreIA5Match
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
 # 9.3.24.  NS Record
 #
@@ -472,7 +481,8 @@ attributetype ( 0.9.2342.19200300.100.1.28 NAME 'mXRecord'
 #
 ## incorrect syntax!!
 attributetype ( 0.9.2342.19200300.100.1.29 NAME 'nSRecord'
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+       EQUALITY caseIgnoreIA5Match
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
 # 9.3.25.  SOA Record
 #
@@ -486,7 +496,8 @@ attributetype ( 0.9.2342.19200300.100.1.29 NAME 'nSRecord'
 #
 ## incorrect syntax!!
 attributetype ( 0.9.2342.19200300.100.1.30 NAME 'sOARecord'
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+       EQUALITY caseIgnoreIA5Match
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
 # 9.3.26.  CNAME Record
 #
@@ -500,7 +511,8 @@ attributetype ( 0.9.2342.19200300.100.1.30 NAME 'sOARecord'
 #
 ## incorrect syntax!!
 attributetype ( 0.9.2342.19200300.100.1.31 NAME 'cNAMERecord'
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+       EQUALITY caseIgnoreIA5Match
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
 # 9.3.27.  Associated Domain
 #
@@ -519,7 +531,7 @@ attributetype ( 0.9.2342.19200300.100.1.31 NAME 'cNAMERecord'
 attributetype ( 0.9.2342.19200300.100.1.37 NAME 'associatedDomain'
        EQUALITY caseIgnoreIA5Match
        SUBSTR caseIgnoreIA5SubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
 # 9.3.28.  Associated Name
 #
@@ -567,7 +579,7 @@ attributetype ( 0.9.2342.19200300.100.1.39 NAME 'homePostalAddress'
 attributetype ( 0.9.2342.19200300.100.1.40 NAME 'personalTitle'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       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} )
 
 # 9.3.31.  Mobile Telephone Number
 #
@@ -582,7 +594,7 @@ attributetype ( 0.9.2342.19200300.100.1.40 NAME 'personalTitle'
 #    ::= {pilotAttributeType 41}
 #
 attributetype ( 0.9.2342.19200300.100.1.41
-       NAME ( 'mobileTelephoneNumber' 'mobile' )
+       NAME ( 'mobile' 'mobileTelephoneNumber' )
        EQUALITY telephoneNumberMatch
        SUBSTR telephoneNumberSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
@@ -599,7 +611,7 @@ attributetype ( 0.9.2342.19200300.100.1.41
 #    ::= {pilotAttributeType 42}
 #
 attributetype ( 0.9.2342.19200300.100.1.42
-       NAME ( 'pagerTelephoneNumber' 'pager' )
+       NAME ( 'pager' 'pagerTelephoneNumber' )
        EQUALITY telephoneNumberMatch
        SUBSTR telephoneNumberSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
@@ -616,7 +628,7 @@ attributetype ( 0.9.2342.19200300.100.1.42
 #    ::= {pilotAttributeType 43}
 #
 attributetype ( 0.9.2342.19200300.100.1.43
-       NAME ( 'friendlyCountryName' 'co' )
+       NAME ( 'co' 'friendlyCountryName' )
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
@@ -638,7 +650,7 @@ attributetype ( 0.9.2342.19200300.100.1.43
 #
 attributetype ( 0.9.2342.19200300.100.1.44 NAME 'uniqueIdentifier'
        EQUALITY caseIgnoreMatch
-       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} )
 
 # 9.3.35.  Organisational Status
 #
@@ -659,7 +671,7 @@ attributetype ( 0.9.2342.19200300.100.1.44 NAME 'uniqueIdentifier'
 attributetype ( 0.9.2342.19200300.100.1.45 NAME 'organizationalStatus'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       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} )
 
 # 9.3.36.  Janet Mailbox
 #
@@ -678,8 +690,8 @@ attributetype ( 0.9.2342.19200300.100.1.45 NAME 'organizationalStatus'
 #
 attributetype ( 0.9.2342.19200300.100.1.46 NAME 'janetMailbox'
        EQUALITY caseIgnoreIA5Match
-       SUBSTR caseIgnoreSubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+       SUBSTR caseIgnoreIA5SubstringsMatch
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # 9.3.37.  Mail Preference Option
 #
@@ -706,8 +718,9 @@ attributetype ( 0.9.2342.19200300.100.1.46 NAME 'janetMailbox'
 #                }
 #    ::= {pilotAttributeType 47}
 #
-attributetype ( 0.9.2342.19200300.100.1.47 NAME 'mailPreferenceOption'
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.32 )
+attributetype ( 0.9.2342.19200300.100.1.47
+       NAME 'mailPreferenceOption'
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
 # 9.3.38.  Building Name
 #
@@ -723,7 +736,7 @@ attributetype ( 0.9.2342.19200300.100.1.47 NAME 'mailPreferenceOption'
 attributetype ( 0.9.2342.19200300.100.1.48 NAME 'buildingName'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
-       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} )
 
 # 9.3.39.  DSA Quality
 #
@@ -737,9 +750,7 @@ attributetype ( 0.9.2342.19200300.100.1.48 NAME 'buildingName'
 #    ::= {pilotAttributeType 49}
 #
 attributetype ( 0.9.2342.19200300.100.1.49 NAME 'dSAQuality'
-       EQUALITY caseIgnoreMatch
-       SUBSTR caseIgnoreSubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.19 SINGLE-VALUE )
 
 # 9.3.40.  Single Level Quality
 #
@@ -753,9 +764,7 @@ attributetype ( 0.9.2342.19200300.100.1.49 NAME 'dSAQuality'
 #    ::= {pilotAttributeType 50}
 #
 attributetype ( 0.9.2342.19200300.100.1.50 NAME 'singleLevelQuality'
-       EQUALITY caseIgnoreMatch
-       SUBSTR caseIgnoreSubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.13 SINGLE-VALUE )
 
 # 9.3.41.  Subtree Minimum Quality
 #
@@ -770,9 +779,7 @@ attributetype ( 0.9.2342.19200300.100.1.50 NAME 'singleLevelQuality'
 #    ::= {pilotAttributeType 51}
 #
 attributetype ( 0.9.2342.19200300.100.1.51 NAME 'subtreeMinimumQuality'
-       EQUALITY caseIgnoreMatch
-       SUBSTR caseIgnoreSubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.13 SINGLE-VALUE )
 
 # 9.3.42.  Subtree Maximum Quality
 #
@@ -787,9 +794,7 @@ attributetype ( 0.9.2342.19200300.100.1.51 NAME 'subtreeMinimumQuality'
 #    ::= {pilotAttributeType 52}
 #
 attributetype ( 0.9.2342.19200300.100.1.52 NAME 'subtreeMaximumQuality'
-       EQUALITY caseIgnoreMatch
-       SUBSTR caseIgnoreSubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.13 SINGLE-VALUE )
 
 # 9.3.43.  Personal Signature
 #
@@ -810,7 +815,7 @@ attributetype ( 0.9.2342.19200300.100.1.52 NAME 'subtreeMaximumQuality'
 #    ::= {pilotAttributeType 53}
 #
 attributetype ( 0.9.2342.19200300.100.1.53 NAME 'personalSignature'
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.23 )
 
 # 9.3.44.  DIT Redirect
 #
@@ -843,7 +848,7 @@ attributetype ( 0.9.2342.19200300.100.1.54 NAME 'dITRedirect'
 #    ::= {pilotAttributeType 55}
 #
 attributetype ( 0.9.2342.19200300.100.1.55 NAME 'audio'
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.4 )
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.4{25000} )
 
 # 9.3.46.  Publisher of Document
 #
@@ -1015,7 +1020,8 @@ objectclass ( 0.9.2342.19200300.100.4.3 NAME 'pilotObject'
 #                    personalSignature}
 #    ::= {pilotObjectClass 4}
 #
-objectclass ( 0.9.2342.19200300.100.4.4 NAME 'pilotPerson'
+objectclass ( 0.9.2342.19200300.100.4.4
+       NAME ( 'pilotPerson' 'newPilotPerson' )
        SUP person STRUCTURAL
        MAY ( userid $ textEncodedORAddress $ rfc822Mailbox $
                favouriteDrink $ roomNumber $ userClass $
@@ -1247,7 +1253,7 @@ objectclass ( 0.9.2342.19200300.100.4.17 NAME 'domainRelatedObject'
 #    ::= {pilotObjectClass 18}
 #
 objectclass ( 0.9.2342.19200300.100.4.18 NAME 'friendlyCountry'
-       SUP country AUXILIARY
+       SUP country STRUCTURAL
        MUST friendlyCountryName )
 
 # 8.3.12.  Simple Security Object
@@ -1281,7 +1287,7 @@ objectclass ( 0.9.2342.19200300.100.4.18 NAME 'friendlyCountry'
 #    ::= {pilotObjectClass 20}
 #
 objectclass ( 0.9.2342.19200300.100.4.20 NAME 'pilotOrganization'
-       SUP ( organization $ organizationalUnit ) AUXILIARY
+       SUP ( organization $ organizationalUnit ) STRUCTURAL
        MAY buildingName )
 
 # 8.3.14.  Pilot DSA
@@ -1297,7 +1303,7 @@ objectclass ( 0.9.2342.19200300.100.4.20 NAME 'pilotOrganization'
 #    ::= {pilotObjectClass 21}
 #
 objectclass ( 0.9.2342.19200300.100.4.21 NAME 'pilotDSA'
-       SUP dsa AUXILIARY
+       SUP dsa STRUCTURAL
        MAY dSAQuality )
 
 # 8.3.15.  Quality Labelled Data
@@ -1316,7 +1322,7 @@ objectclass ( 0.9.2342.19200300.100.4.21 NAME 'pilotDSA'
 #            subtreeMaximumQuality}
 #    ::= {pilotObjectClass 22}
 objectclass ( 0.9.2342.19200300.100.4.22 NAME 'qualityLabelledData'
-       SUP top
+       SUP top AUXILIARY
        MUST dsaQuality
        MAY ( subtreeMinimumQuality $ subtreeMaximumQuality )
        )

diff --git a/servers/slapd/schema/openldap.schema b/servers/slapd/schema/openldap.schema
index 778ee9d2ca2a19c308bc8f40b7c69577abc23eaf..17e299d1a050b71f24f5b5b673038f955adc2bfb 100644 (file)
--- a/servers/slapd/schema/openldap.schema
+++ b/servers/slapd/schema/openldap.schema
@@ -21,5 +21,5 @@
 attributetype ( 1.3.6.1.4.1.4203.666.1.3  NAME 'entry' SUP name
       SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )
 
-attributetype ( 1.3.6.1.4.1.4203.666.1.4 childrenOID NAME 'children' SUP name
+attributetype ( 1.3.6.1.4.1.4203.666.1.4 NAME 'children' SUP name
       SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 64c88b0b226d8ab3205ad5642cdced17ab9cf676..af614ae76cdfc27bd3f75b9ee35734df7ba5010f 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -292,6 +292,8 @@ struct syntax_defs_rec syntax_defs[] = {
                NULL, NULL, NULL},
        {"( 1.3.6.1.4.1.1466.115.121.1.12 DESC 'DN' )",
                0, NULL, NULL, NULL},
+       {"( 1.3.6.1.4.1.1466.115.121.1.13 DESC 'DataQuality' )",
+               0, NULL, NULL, NULL},
        {"( 1.3.6.1.4.1.1466.115.121.1.14 DESC 'DeliveryMethod' )",
                0, NULL, NULL, NULL},
        {"( 1.3.6.1.4.1.1466.115.121.1.15 DESC 'DirectoryString' )",
@@ -300,10 +302,14 @@ struct syntax_defs_rec syntax_defs[] = {
                0, NULL, NULL, NULL},
        {"( 1.3.6.1.4.1.1466.115.121.1.17 DESC 'DITStructureRuleDescription' )",
                0, NULL, NULL, NULL},
+       {"( 1.3.6.1.4.1.1466.115.121.1.19 DESC 'DSAQuality' )",
+               0, NULL, NULL, NULL},
        {"( 1.3.6.1.4.1.1466.115.121.1.21 DESC 'EnhancedGuide' )",
                0, NULL, NULL, NULL},
        {"( 1.3.6.1.4.1.1466.115.121.1.22 DESC 'FacsimileTelephoneNumber' )",
                0, NULL, NULL, NULL},
+       {"( 1.3.6.1.4.1.1466.115.121.1.23 DESC 'Fax' )",
+               0, NULL, NULL, NULL},
        {"( 1.3.6.1.4.1.1466.115.121.1.24 DESC 'GeneralizedTime' )",
                0, NULL, NULL, NULL},
        {"( 1.3.6.1.4.1.1466.115.121.1.25 DESC 'Guide' )",