From 336f054d055833869b9ef5bb47b566ff9a61b446 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Julio=20S=C3=A1nchez=20Fern=C3=A1ndez?= Date: Sun, 15 Oct 2000 19:12:21 +0000 Subject: [PATCH] Extend MRA. It now has a pointer to a MatchingRule, but a char pointer is kept for messages and to tell a filter without rule from one with an unknown rule. It matters. Fix a couple of bugs in debug output. --- servers/slapd/filter.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c index c993dae7c7..a29539d07d 100644 --- a/servers/slapd/filter.c +++ b/servers/slapd/filter.c @@ -268,15 +268,14 @@ get_filter( *fstr = ch_malloc( sizeof("(:dn::=)") + (f->f_mr_desc ? f->f_mr_desc->ad_cname->bv_len : 0) - + (f->f_mr_rule ? strlen(f->f_mr_rule) : 0) + + (f->f_mr_rule_text ? strlen(f->f_mr_rule_text) : 0) + escaped.bv_len ); sprintf( *fstr, "(%s%s%s%s:=%s)", (f->f_mr_desc ? f->f_mr_desc->ad_cname->bv_val : ""), (f->f_mr_dnattrs ? ":dn" : ""), - (f->f_mr_rule ? ":" : ""), - (f->f_mr_rule ? f->f_mr_rule : ""), - f->f_mr_desc->ad_cname->bv_val, + (f->f_mr_rule_text ? ":" : ""), + (f->f_mr_rule_text ? f->f_mr_rule_text : ""), escaped.bv_val ); ber_memfree( escaped.bv_val ); -- 2.39.5