From 47e0c78bac90f2c22410ee6609f802c9764e2109 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 23 Apr 2007 07:25:09 +0000 Subject: 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) --- source4/dsdb/samdb/ldb_modules/entryUUID.c | 4 ++++ source4/lib/ldb/tools/convert.c | 9 +++++++++ 2 files changed, 13 insertions(+) (limited to 'source4') 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", -- cgit