We don't have a definition for caseIgnoreListSubstringsMatch, disable

references to it for now.
Fix some broken definitions.
We don't have a definition for caseIgnoreIA5SubstringsMatch either,
delete for now.
Define buildingName, it was being referenced.

diff --git a/servers/slapd/schema/pilot.schema b/servers/slapd/schema/pilot.schema
index 8abb12b0b0408bbed506b19d0a3fffc85d7f93a6..bc6e5a34b29bbe37dfeaba71f7a9d442fc8399da 100644 (file)
--- a/servers/slapd/schema/pilot.schema
+++ b/servers/slapd/schema/pilot.schema
@@ -93,9 +93,9 @@ attribute ( 0.9.2342.19200300.100.1.22 NAME 'otherMailbox'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.39 )
 
 # Netscape defines this with syntax 1.15 TBC
+# Mathcing rules for this are unknown
 
 attribute ( 0.9.2342.19200300.100.1.23 NAME 'lastModifiedTime'
-       EQUALITY ??
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.53 )
 
 attribute ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy'
@@ -103,10 +103,14 @@ attribute ( 0.9.2342.19200300.100.1.24 NAME 'lastModifiedBy'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
 # 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'
+#      EQUALITY caseIgnoreIA5Match
+#      SUBSTR caseIgnoreIA5SubstringsMatch
+#      SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 attribute ( 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 )
 
 # This is aRecord in RFC1274.  However, objectclass dNSDomain as we
@@ -124,9 +128,13 @@ attribute ( 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 )
 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 )
 
 attribute ( 0.9.2342.19200300.100.1.38 NAME 'associatedName'
@@ -134,9 +142,11 @@ attribute ( 0.9.2342.19200300.100.1.38 NAME 'associatedName'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
 # Netscape gives syntax 1.15 to this.  TBC
+# We take the matching rules from postalAddress in RFC2256
+# Show stopper: we don't have the definition of caseIgnoreListSubstringsMatch
 
 attribute ( 0.9.2342.19200300.100.1.39 NAME 'homePostalAddress'
-       EQUALITY ??
+       EQUALITY caseIgnoreListMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
 
 attribute ( 0.9.2342.19200300.100.1.40 NAME 'personalTitle'
@@ -176,7 +186,10 @@ attribute ( 0.9.2342.19200300.100.1.46 NAME 'janetMailbox'
 attribute ( 0.9.2342.19200300.100.1.47 NAME 'mailPreferenceOption'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.32 SINGLE-VALUE )
 
-# 0.9.2342.19200300.100.1.48 was buildingName in RFC1274
+attribute ( 0.9.2342.19200300.100.1.48 NAME 'buildingName'
+       EQUALITY caseIgnoreMatch
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+
 # 0.9.2342.19200300.100.1.49 was dSAQuality in RFC1274
 # 0.9.2342.19200300.100.1.50 was singleLevelQuality in RFC1274
 # 0.9.2342.19200300.100.1.51 was subtreeMinimumQuality in RFC1274