From: Pierangelo Masarati <ando@openldap.org>
Date: Sun, 29 Jun 2008 22:19:14 +0000 (+0000)
Subject: make sure the strfilter is in normal form (ITS#5581)
X-Git-Tag: LOCKER_IDS~79
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=48855fcdef878e0785382b1d61c13f4156fe9930;p=openldap

make sure the strfilter is in normal form (ITS#5581)
---

diff --git a/servers/slapd/overlays/unique.c b/servers/slapd/overlays/unique.c
index e5c8238291..af39de3ab2 100644
--- a/servers/slapd/overlays/unique.c
+++ b/servers/slapd/overlays/unique.c
@@ -238,15 +238,15 @@ unique_new_domain_uri ( unique_domain_uri **urip,
 	}
 
 	if (url_desc->lud_filter) {
-		Filter * f;
-		ber_str2bv( url_desc->lud_filter, 0, 1, &uri->filter );
-		f = str2filter( uri->filter.bv_val );
+		Filter *f = str2filter( url_desc->lud_filter );
 		if ( !f ) {
 			snprintf( c->cr_msg, sizeof( c->cr_msg ),
 				  "unique: bad filter");
 			rc = ARG_BAD_CONF;
 			goto exit;
 		}
+		/* make sure the strfilter is in normal form (ITS#5581) */
+		filter2bv( f, &uri->filter );
 		filter_free( f );
 	}
 exit: