svn commit: samba r22476 - in branches/SAMBA_4_0/source: dsdb/samdb/ldb_modules lib/ldb/tools

[abartlet at samba.org]

Author: abartlet
Date: 2007-04-23 07:25:09 +0000 (Mon, 23 Apr 2007)
New Revision: 22476

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22476

Log:
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

Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/entryUUID.c
   branches/SAMBA_4_0/source/lib/ldb/tools/convert.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/entryUUID.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/entryUUID.c	2007-04-23 07:23:45 UTC (rev 22475)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/entryUUID.c	2007-04-23 07:25:09 UTC (rev 22476)
@@ -360,6 +360,7 @@
 			 }
 		}
 	},
+#if 0
 	{
 		.local_name = "allowedChildClassesEffective",
 		.type = MAP_CONVERT,
@@ -371,6 +372,7 @@
 			},
 		},
 	},
+#endif
 	{
 		.local_name = "objectCategory",
 		.type = MAP_CONVERT,
@@ -508,6 +510,7 @@
 			 }
 		}
 	},
+#if 0
 	{
 		.local_name = "allowedChildClassesEffective",
 		.type = MAP_CONVERT,
@@ -519,6 +522,7 @@
 			},
 		},
 	},
+#endif
 	{
 		.local_name = "objectCategory",
 		.type = MAP_CONVERT,

Modified: branches/SAMBA_4_0/source/lib/ldb/tools/convert.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/convert.c	2007-04-23 07:23:45 UTC (rev 22475)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/convert.c	2007-04-23 07:25:09 UTC (rev 22476)
@@ -34,14 +34,23 @@
 		.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",
 		.equality = "caseIgnoreMatch",
 		.substring = "caseIgnoreSubstringsMatch",