summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-04-23 07:25:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:31 -0500
commit47e0c78bac90f2c22410ee6609f802c9764e2109 (patch)
tree225cb434bd709b394231bfb6d08d19ffdc0a0758
parent1222a1c456785f2b0046efc271ac8bfff3be2753 (diff)
downloadsamba-47e0c78bac90f2c22410ee6609f802c9764e2109.tar.gz
samba-47e0c78bac90f2c22410ee6609f802c9764e2109.tar.bz2
samba-47e0c78bac90f2c22410ee6609f802c9764e2109.zip
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)
-rw-r--r--source4/dsdb/samdb/ldb_modules/entryUUID.c4
-rw-r--r--source4/lib/ldb/tools/convert.c9
2 files changed, 13 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/entryUUID.c b/source4/dsdb/samdb/ldb_modules/entryUUID.c
index 7cd79cb730..3196069fa8 100644
--- 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 2320970030..ed1330debc 100644
--- 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",