Updated for schemas.

[openldap] / servers / slapd / schema / pilot.schema

diff --git a/servers/slapd/schema/pilot.schema b/servers/slapd/schema/pilot.schema
index ed9e18e425d206bf7d62f7586ac0f093bd5958fa..05e9552af780098983cf6ab8fbad457c0248ade4 100644 (file)
--- a/servers/slapd/schema/pilot.schema
+++ b/servers/slapd/schema/pilot.schema
@@ -21,10 +21,6 @@
 
 # Believe it or not, this is case-insensitive
 
-attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' )
-       EQUALITY caseIgnoreMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
 attributetype ( 0.9.2342.19200300.100.1.2 NAME 'textEncodedORAddress'
        EQUALITY caseIgnoreMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
@@ -106,13 +102,10 @@ attributetype ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy'
 # This is the definition as defined in RFC2247
 # Terrific, we don't know about caseIgnoreIA5SubstringsMatch
 
-#attribute ( 0.9.2342.19200300.100.1.25 NAME 'dc'
+# See RFC2247 define in core.schema
+#attributetype ( 0.9.2342.19200300.100.1.25 NAME 'dc'
 #      EQUALITY caseIgnoreIA5Match
-#      SUBSTR caseIgnoreIA5SubstringsMatch
 #      SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-attributetype ( 0.9.2342.19200300.100.1.25 NAME 'dc'
-       EQUALITY caseIgnoreIA5Match
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
 # This is aRecord in RFC1274.  However, objectclass dNSDomain as we
 # and Netscape use it is very different.
@@ -129,14 +122,10 @@ attributetype ( 0.9.2342.19200300.100.1.26 NAME 'dNSRecord'
 # 0.9.2342.19200300.100.1.30 was sOARecord in RFC1274
 # 0.9.2342.19200300.100.1.31 was cNAMERecord in RFC1274
 
-# Terrific, we don't know about caseIgnoreIA5SubstringsMatch
 #attribute ( 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 )
-attributetype ( 0.9.2342.19200300.100.1.37 NAME 'associatedDomain'
-       EQUALITY caseIgnoreIA5Match
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
 attributetype ( 0.9.2342.19200300.100.1.38 NAME 'associatedName'
        EQUALITY distinguishedNameMatch
@@ -216,7 +205,7 @@ attributetype ( 0.9.2342.19200300.100.1.56 NAME 'documentPublisher'
        EQUALITY caseIgnoreMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-# From ietf-draft-smith-inetorgperson-xx.txt
+# From RFC 2798 (inetOrgPerson)
 attributetype ( 0.9.2342.19200300.100.1.60
        NAME 'jpegPhoto'
        DESC 'a JPEG image'
@@ -317,7 +306,6 @@ objectclass ( 0.9.2342.19200300.100.4.9 NAME 'documentSeries' SUP top
        l $ o $ ou ) )
 
 # This definition is much longer than that in RFC1274 and is taken from RFC2247
-
 objectclass ( 0.9.2342.19200300.100.4.13 NAME 'domain' SUP top STRUCTURAL
      MUST dc
      MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $