]> git.sur5r.net Git - openldap/commitdiff
Extend MRA. It now has a pointer to a MatchingRule, but a char
authorJulio Sánchez Fernández <jsanchez@openldap.org>
Sun, 15 Oct 2000 19:12:21 +0000 (19:12 +0000)
committerJulio Sánchez Fernández <jsanchez@openldap.org>
Sun, 15 Oct 2000 19:12:21 +0000 (19:12 +0000)
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

index c993dae7c7556bda3aff6312be058ebd39b998f4..a29539d07d13210d8ea0d770adbe18a6a36adefc 100644 (file)
@@ -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 );