r22476: The OID match is used very oddly in AD, as it is often used for fields

that contain attribute names and objectClasses.  Make it a case
insensitive string for now.

Andrew Bartlett
(This used to be commit 9908a05ef70c748c699b5a18178e7948f7814d7a)

diff --git a/source4/dsdb/samdb/ldb_modules/entryUUID.c b/source4/dsdb/samdb/ldb_modules/entryUUID.c
index 7cd79cb730d396c35a73d98ae396acd615793ff5..3196069fa84ba064b7546609bdc748458d5b4da7 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/entryUUID.c
+++ b/source4/dsdb/samdb/ldb_modules/entryUUID.c
@@ -360,6 +360,7 @@ const struct ldb_map_attribute entryUUID_attributes[] =
                         }
                }
        },
+#if 0
        {
                .local_name = "allowedChildClassesEffective",
                .type = MAP_CONVERT,
@@ -371,6 +372,7 @@ const struct ldb_map_attribute entryUUID_attributes[] =
                        },
                },
        },
+#endif
        {
                .local_name = "objectCategory",
                .type = MAP_CONVERT,
@@ -508,6 +510,7 @@ const struct ldb_map_attribute nsuniqueid_attributes[] =
                         }
                }
        },
+#if 0
        {
                .local_name = "allowedChildClassesEffective",
                .type = MAP_CONVERT,
@@ -519,6 +522,7 @@ const struct ldb_map_attribute nsuniqueid_attributes[] =
                        },
                },
        },
+#endif
        {
                .local_name = "objectCategory",
                .type = MAP_CONVERT,

diff --git a/source4/lib/ldb/tools/convert.c b/source4/lib/ldb/tools/convert.c
index 232097003044c37e7e0ca193dbf57630386f9802..ed1330debcae8efbd6317dd4e47b32508a1b9e2d 100644 (file)
--- a/source4/lib/ldb/tools/convert.c
+++ b/source4/lib/ldb/tools/convert.c
@@ -34,12 +34,21 @@ static const struct syntax_map syntax_map[] = {
                .equality = "distinguishedNameMatch",
                .comment = "Object(DS-DN) == a DN" 
        },
+#if 0
        {
                .Standard_OID =  "1.3.6.1.4.1.1466.115.121.1.38",
                .AD_OID =  "2.5.5.2",
                .equality = "objectIdentifierMatch",
                .comment =  "OID String"
        },
+#else 
+       { 
+               .Standard_OID =  "1.2.840.113556.1.4.905", 
+               .AD_OID =  "2.5.5.2",
+               .equality = "caseIgnoreMatch",
+               .comment =   "OID as a Case Insensitive String" 
+       },
+#endif
        { 
                .Standard_OID =  "1.2.840.113556.1.4.905", 
                .AD_OID =  "2.5.5.4",