From: Howard Chu <hyc@openldap.org>
Date: Wed, 19 May 2004 07:34:32 +0000 (+0000)
Subject: Fix prev commit, test015 works now
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e7d634353202987ce9a624121564f8ea62f2dc0f;p=openldap

Fix prev commit, test015 works now
---

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index 0510cc5b18..bb14f676fa 100644
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -318,8 +318,6 @@ static int test_mra_filter(
 			return LDAP_INVALID_SYNTAX;
 		}
 
-		rc = LDAP_COMPARE_FALSE;
-
 		/* for each AVA of each RDN ... */
 		for ( iRDN = 0; dn[ 0 ][ iRDN ]; iRDN++ ) {
 			LDAPRDN		*rdn = dn[ 0 ][ iRDN ];
@@ -372,18 +370,17 @@ static int test_mra_filter(
 					ch_free( value.bv_val );
 				}
 
-				if( rc != LDAP_SUCCESS ) {
-					break;
+				if ( rc == LDAP_SUCCESS && ret == 0 ) {
+					rc = LDAP_COMPARE_TRUE;
 				}
 
-				if ( ret == 0 ) {
-					rc = LDAP_COMPARE_TRUE;
-					break;
+				if( rc != LDAP_SUCCESS ) {
+					ldap_dnfree( dn );
+					return rc;
 				}
 			}
 		}
 		ldap_dnfree( dn );
-		return rc;
 	}
 
 	return LDAP_COMPARE_FALSE;