From 785b452a042f00b561df55243e8aaee920d84ce6 Mon Sep 17 00:00:00 2001 From: Derrell Lipman Date: Tue, 14 Jun 2005 03:04:24 +0000 Subject: r7561: moved OID constants into ldb.h and used manifest constants in ldb_match.c (This used to be commit 42cbb155c20779c458f727488c8554842b24681b) --- source4/lib/ldb/include/ldb.h | 6 ++++++ source4/lib/ldb/ldb_tdb/ldb_match.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h index 5773e39fa9..7a28d05b38 100644 --- a/source4/lib/ldb/include/ldb.h +++ b/source4/lib/ldb/include/ldb.h @@ -71,6 +71,12 @@ struct ldb_val { #define LDB_FLAG_MOD_DELETE 3 +/* + 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 */ diff --git a/source4/lib/ldb/ldb_tdb/ldb_match.c b/source4/lib/ldb/ldb_tdb/ldb_match.c index 51b0ab9aa7..4c11542971 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_match.c +++ b/source4/lib/ldb/ldb_tdb/ldb_match.c @@ -333,8 +333,8 @@ static int ltdb_extended_match(struct ldb_module *module, 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; -- cgit