--- servers/slapd/filter.c	2000/10/13 18:41:56	1.54
+++ servers/slapd/filter.c	2000/10/15 17:12:21	1.55
@@ -1,5 +1,5 @@
 /* filter.c - routines for parsing and dealing with filters */
-/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.53 2000/10/09 17:13:17 jsanchez Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.54 2000/10/13 18:41:56 jsanchez Exp $ */
 /*
  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT 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 );