X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffilter.c;h=63975090bcad9e121b695033a9048b44e14ba4cf;hb=75757a5c82fc6a9333807517705c99e090428142;hp=4582be62bb2d2acb3b97fae0e9e012395a03073e;hpb=af183089b8ea041e38d502adca1cd421c531df89;p=openldap

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 4582be62bb..63975090bc 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -414,7 +414,7 @@ get_substring_filter(
 			goto return_error;
 		}
 
-		/* valiate using equality matching rule validator! */
+		/* validate using equality matching rule validator! */
 		rc = value_validate( f->f_sub_desc->ad_type->sat_equality,
 			&value, text );
 		if( rc != LDAP_SUCCESS ) {
@@ -1531,92 +1531,3 @@ return_error:
 	return( LDAP_SUCCESS );
 }
 
-#ifdef SLAP_X_FILTER_HASSUBORDINATES
-static int filter_has_subordinates_list(
-	Filter		*filter );
-
-/*
- * FIXME: we could detect the need to filter
- * for hasSubordinates when parsing the filter ...
- */
-
-static int
-filter_has_subordinates_list(
-	Filter		*fl )
-{
-	Filter			*f;
-
-	for ( f = fl; f != NULL; f = f->f_next ) {
-		int	rc;
-
-		rc = filter_has_subordinates( f );
-
-		if ( rc ) {
-			return rc;
-		}
-	}
-
-	return 0;
-}
-
-int
-filter_has_subordinates(
-	Filter		*f )
-{
-	AttributeDescription	*ad = NULL;
-
-	switch ( f->f_choice ) {
-	case LDAP_FILTER_PRESENT:
-		ad = f->f_desc;
-		break;
-
-	case LDAP_FILTER_EQUALITY:
-	case LDAP_FILTER_APPROX:
-	case LDAP_FILTER_GE:
-	case LDAP_FILTER_LE:
-		ad = f->f_ava->aa_desc;
-		break;
-
-	case LDAP_FILTER_SUBSTRINGS:
-		ad = f->f_sub_desc;
-		break;
-
-	case LDAP_FILTER_EXT:
-		/* could be null; however here it is harmless */
-		ad = f->f_mra->ma_desc;
-		break;
-
-	case LDAP_FILTER_NOT:
-		return filter_has_subordinates( f->f_not );
-
-	case LDAP_FILTER_AND:
-		return filter_has_subordinates_list( f->f_and );
-
-	case LDAP_FILTER_OR:
-		return filter_has_subordinates_list( f->f_or );
-
-	case SLAPD_FILTER_COMPUTED:
-		/*
-		 * something wrong?
-		 */
-		return 0;
-
-	default:
-		/*
-		 * this means a new type of filter has been implemented,
-		 * which is not handled yet in this function; we should
-		 * issue a developer's warning, e.g. an assertion
-		 */
-		assert( 0 );
-		return -1;
-	}
-
-	if ( ad == slap_schema.si_ad_hasSubordinates ) {
-		return 1;
-	}
-
-	return 0;
-}
-
-#endif /* SLAP_X_FILTER_HASSUBORDINATES */
-