From 6c1758ae3399d96792e8eed9603d1996dcc0bd92 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 7 Jul 1999 18:02:32 +0000 Subject: [PATCH] Add matching rule assertion structure to filter union. --- servers/slapd/slap.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index ac775392f1..946f56aae8 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -84,6 +84,13 @@ typedef struct ava { struct berval ava_value; } Ava; +typedef struct mra { + char *mra_rule; + char *mra_type; + char *mra_value; + int mra_dnattrs; +} Mra; + /* * represents a search filter */ @@ -97,6 +104,9 @@ typedef struct filter { /* equality, lessorequal, greaterorequal, approx */ Ava f_un_ava; + /* extensible */ + Mra f_un_fra; + /* and, or, not */ struct filter *f_un_complex; @@ -112,6 +122,10 @@ typedef struct filter { #define f_ava f_un.f_un_ava #define f_avtype f_un.f_un_ava.ava_type #define f_avvalue f_un.f_un_ava.ava_value +#define f_mra f_un.f_un_mra +#define f_mrtype f_un.f_un_mra.mra_type +#define f_mrvalue f_un.f_un_mra.mra_value +#define f_mrdnaddrs f_un.f_un_mra.mra_dnattrs #define f_and f_un.f_un_complex #define f_or f_un.f_un_complex #define f_not f_un.f_un_complex @@ -486,7 +500,6 @@ struct backend_info { int (*bi_op_delete) LDAP_P((BackendDB *bd, struct slap_conn *c, struct slap_op *o, char *dn)); - /* Bug: be_op_abandon in unused! */ int (*bi_op_abandon) LDAP_P((BackendDB *bd, struct slap_conn *c, struct slap_op *o, ber_int_t msgid)); -- 2.39.5