From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 7 Sep 2004 05:01:53 +0000 (+0000)
Subject: backport hasSubordinate filter type assertion fix
X-Git-Tag: OPENLDAP_REL_ENG_2_2_16~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3a47fd1f9c514f45ae20767851ff10959cd659ea;p=openldap

backport hasSubordinate filter type assertion fix
---

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index ceba658ced..ac36b8a0af 100644
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -463,10 +463,8 @@ test_ava_filter(
 		int		hasSubordinates;
 		struct berval	hs;
 
-		/*
-		 * No other match should be allowed ...
-		 */
-		assert( type == LDAP_FILTER_EQUALITY );
+		/* No other match is supported */
+		if( type != LDAP_FILTER_EQUALITY ) return LDAP_OTHER;
 		
 		if ( op->o_bd->be_has_subordinates( op, e, &hasSubordinates ) !=
 			LDAP_SUCCESS )