From 681431e73a06929c867a23a44a843886e14fba5f Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 19 May 2004 07:31:22 +0000 Subject: [PATCH] Fix prev commit, test015 works again --- servers/slapd/filterentry.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c index 8ac43338fe..8527c038d9 100644 --- a/servers/slapd/filterentry.c +++ b/servers/slapd/filterentry.c @@ -330,8 +330,6 @@ static int test_mra_filter( return LDAP_INVALID_SYNTAX; } - rc = LDAP_COMPARE_FALSE; - /* for each AVA of each RDN ... */ for ( iRDN = 0; dn[ iRDN ]; iRDN++ ) { LDAPRDN rdn = dn[ iRDN ]; @@ -385,18 +383,17 @@ static int test_mra_filter( op->o_tmpfree( value.bv_val, memctx ); } - 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_x( dn, memctx ); + return rc; } } } ldap_dnfree_x( dn, memctx ); - return rc; } return LDAP_COMPARE_FALSE; -- 2.39.5