backport hasSubordinate filter type assertion fix

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index ceba658ced0deb0379df1214f636862f8370100d..ac36b8a0af6a9d3f7c92b3e34da9fe7d7c54bd83 100644 (file)
--- 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 )