svn commit: samba r7561 - in branches/SAMBA_4_0/source/lib/ldb: include ldb_tdb

[derrell at samba.org]

Author: derrell
Date: 2005-06-14 03:04:24 +0000 (Tue, 14 Jun 2005)
New Revision: 7561

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

Log:
moved OID constants into ldb.h and used manifest constants in ldb_match.c
Modified:
   branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_match.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb.h	2005-06-14 02:34:13 UTC (rev 7560)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb.h	2005-06-14 03:04:24 UTC (rev 7561)
@@ -72,6 +72,12 @@
 
 
 /*
+  well known object IDs
+*/
+#define LDB_OID_COMPARATOR_AND  "1.2.840.113556.1.4.803"
+#define LDB_OID_COMPARATOR_OR   "1.2.840.113556.1.4.804"
+
+/*
   results are given back as arrays of ldb_message_element
 */
 struct ldb_message_element {

Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_match.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_match.c	2005-06-14 02:34:13 UTC (rev 7560)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_match.c	2005-06-14 03:04:24 UTC (rev 7561)
@@ -333,8 +333,8 @@
 		const char *oid;
 		int (*comparator)(struct ldb_val *, struct ldb_val *);
 	} rules[] = {
-		{ "1.2.840.113556.1.4.803", comparator_and},
-		{ "1.2.840.113556.1.4.804", comparator_or}
+		{ LDB_OID_COMPARATOR_AND, comparator_and},
+		{ LDB_OID_COMPARATOR_OR, comparator_or}
 	};
 	int (*comp)(struct ldb_val *, struct ldb_val *) = NULL;
 	struct ldb_message_element *el;