X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffilter.c;h=aa8ee102977ea47d6f10b1756113ad7d92973491;hb=f90ed5aef8f41ee90e1f67b0badbb793cb99f3ed;hp=5f4c686571b0ec3203330cde949b6aab0287e24b;hpb=e2ee741ea86edb97a08b3f217760f1cd5972302e;p=openldap

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 5f4c686571..aa8ee10297 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -15,7 +15,7 @@ static int	get_substring_filter(Connection *conn, BerElement *ber, Filter *f, ch
 int
 get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 {
-	unsigned long	tag, len;
+	ber_len_t	len;
 	int		err;
 	Filter		*f;
 	char		*ftmp;
@@ -34,6 +34,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 	 *		lessOrEqual	[6]	AttributeValueAssertion,
 	 *		present		[7]	AttributeType,,
 	 *		approxMatch	[8]	AttributeValueAssertion
+	 *		extensibleMatch [9] MatchingRuleAssertion
 	 *	}
 	 *
 	 *	SubstringFilter ::= SEQUENCE {
@@ -44,38 +45,27 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 	 *			final            [2] IA5String
 	 *		}
 	 *	}
+	 *
+     *  MatchingRuleAssertion ::= SEQUENCE {
+     *          matchingRule    [1] MatchingRuleId OPTIONAL,
+     *          type            [2] AttributeDescription OPTIONAL,
+     *          matchValue      [3] AssertionValue,
+     *          dnAttributes    [4] BOOLEAN DEFAULT FALSE
+	 *	}
+	 *
 	 */
 
 	f = (Filter *) ch_malloc( sizeof(Filter) );
-	*filt = f;
 	f->f_next = NULL;
 
-	err = 0;
+	err = LDAP_SUCCESS;
 	*fstr = NULL;
 	f->f_choice = ber_peek_tag( ber, &len );
-#ifdef LDAP_COMPAT30
-	if ( conn->c_version == 30 ) {
-		switch ( f->f_choice ) {
-		case LDAP_FILTER_EQUALITY:
-		case LDAP_FILTER_GE:
-		case LDAP_FILTER_LE:
-		case LDAP_FILTER_PRESENT:
-		case LDAP_FILTER_PRESENT_30:
-		case LDAP_FILTER_APPROX:
-			(void) ber_skip_tag( ber, &len );
-			if ( f->f_choice == LDAP_FILTER_PRESENT_30 ) {
-				f->f_choice = LDAP_FILTER_PRESENT;
-			}
-			break;
-		default:
-			break;
-		}
-	}
-#endif
+
 	switch ( f->f_choice ) {
 	case LDAP_FILTER_EQUALITY:
 		Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
-		if ( (err = get_ava( ber, &f->f_ava )) == 0 ) {
+		if ( (err = get_ava( ber, &f->f_ava )) == LDAP_SUCCESS ) {
 			*fstr = ch_malloc(4 + strlen( f->f_avtype ) +
 			    f->f_avvalue.bv_len);
 			sprintf( *fstr, "(%s=%s)", f->f_avtype,
@@ -90,7 +80,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 
 	case LDAP_FILTER_GE:
 		Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
-		if ( (err = get_ava( ber, &f->f_ava )) == 0 ) {
+		if ( (err = get_ava( ber, &f->f_ava )) == LDAP_SUCCESS ) {
 			*fstr = ch_malloc(5 + strlen( f->f_avtype ) +
 			    f->f_avvalue.bv_len);
 			sprintf( *fstr, "(%s>=%s)", f->f_avtype,
@@ -100,7 +90,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 
 	case LDAP_FILTER_LE:
 		Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
-		if ( (err = get_ava( ber, &f->f_ava )) == 0 ) {
+		if ( (err = get_ava( ber, &f->f_ava )) == LDAP_SUCCESS ) {
 			*fstr = ch_malloc(5 + strlen( f->f_avtype ) +
 			    f->f_avvalue.bv_len);
 			sprintf( *fstr, "(%s<=%s)", f->f_avtype,
@@ -111,7 +101,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 	case LDAP_FILTER_PRESENT:
 		Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
 		if ( ber_scanf( ber, "a", &f->f_type ) == LBER_ERROR ) {
-			err = LDAP_PROTOCOL_ERROR;
+			err = -1;
 		} else {
 			err = LDAP_SUCCESS;
 			attr_normalize( f->f_type );
@@ -122,7 +112,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 
 	case LDAP_FILTER_APPROX:
 		Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
-		if ( (err = get_ava( ber, &f->f_ava )) == 0 ) {
+		if ( (err = get_ava( ber, &f->f_ava )) == LDAP_SUCCESS ) {
 			*fstr = ch_malloc(5 + strlen( f->f_avtype ) +
 			    f->f_avvalue.bv_len);
 			sprintf( *fstr, "(%s~=%s)", f->f_avtype,
@@ -133,7 +123,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 	case LDAP_FILTER_AND:
 		Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 );
 		if ( (err = get_filter_list( conn, ber, &f->f_and, &ftmp ))
-		    == 0 ) {
+		    == LDAP_SUCCESS ) {
 			if (ftmp == NULL) ftmp = ch_strdup("");
 			*fstr = ch_malloc( 4 + strlen( ftmp ) );
 			sprintf( *fstr, "(&%s)", ftmp );
@@ -144,7 +134,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 	case LDAP_FILTER_OR:
 		Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 );
 		if ( (err = get_filter_list( conn, ber, &f->f_or, &ftmp ))
-		    == 0 ) {
+		    == LDAP_SUCCESS ) {
 			if (ftmp == NULL) ftmp = ch_strdup("");
 			*fstr = ch_malloc( 4 + strlen( ftmp ) );
 			sprintf( *fstr, "(|%s)", ftmp );
@@ -155,7 +145,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 	case LDAP_FILTER_NOT:
 		Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 );
 		(void) ber_skip_tag( ber, &len );
-		if ( (err = get_filter( conn, ber, &f->f_not, &ftmp )) == 0 ) {
+		if ( (err = get_filter( conn, ber, &f->f_not, &ftmp )) == LDAP_SUCCESS ) {
 			if (ftmp == NULL) ftmp = ch_strdup("");
 			*fstr = ch_malloc( 4 + strlen( ftmp ) );
 			sprintf( *fstr, "(!%s)", ftmp );
@@ -163,6 +153,12 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 		}
 		break;
 
+	case LBER_DEFAULT:
+		Debug( LDAP_DEBUG_ANY, "decoding filter error\n",
+		       0, 0, 0 );
+		err = -1;
+		break;
+
 	default:
 		Debug( LDAP_DEBUG_ANY, "unknown filter type %lu\n",
 		       f->f_choice, 0, 0 );
@@ -170,11 +166,13 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 		break;
 	}
 
-	if ( err != 0 ) {
+	if ( err != LDAP_SUCCESS ) {
 		free( (char *) f );
 		if ( *fstr != NULL ) {
 			free( *fstr );
 		}
+	} else {
+		*filt = f;
 	}
 
 	Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 );
@@ -186,21 +184,18 @@ get_filter_list( Connection *conn, BerElement *ber, Filter **f, char **fstr )
 {
 	Filter		**new;
 	int		err;
-	unsigned long	tag, len;
+	ber_tag_t	tag;
+	ber_len_t	len;
 	char		*last, *ftmp;
 
 	Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 );
 
-#ifdef LDAP_COMPAT30
-	if ( conn->c_version == 30 ) {
-		(void) ber_skip_tag( ber, &len );
-	}
-#endif
 	*fstr = NULL;
 	new = f;
 	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
-	    tag = ber_next_element( ber, &len, last ) ) {
-		if ( (err = get_filter( conn, ber, new, &ftmp )) != 0 )
+	    tag = ber_next_element( ber, &len, last ) )
+	{
+		if ( (err = get_filter( conn, ber, new, &ftmp )) != LDAP_SUCCESS )
 			return( err );
 		if ( *fstr == NULL ) {
 			*fstr = ftmp;
@@ -215,7 +210,7 @@ get_filter_list( Connection *conn, BerElement *ber, Filter **f, char **fstr )
 	*new = NULL;
 
 	Debug( LDAP_DEBUG_FILTER, "end get_filter_list\n", 0, 0, 0 );
-	return( 0 );
+	return( LDAP_SUCCESS );
 }
 
 static int
@@ -226,19 +221,16 @@ get_substring_filter(
     char	**fstr
 )
 {
-	unsigned long	tag, len, rc;
+	ber_tag_t	tag;
+	ber_len_t	len;
+	ber_tag_t	rc;
 	char		*val, *last;
 	int		syntax;
 
 	Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
 
-#ifdef LDAP_COMPAT30
-	if ( conn->c_version == 30 ) {
-		(void) ber_skip_tag( ber, &len );
-	}
-#endif
-	if ( ber_scanf( ber, "{a", &f->f_sub_type ) == LBER_ERROR ) {
-		return( LDAP_PROTOCOL_ERROR );
+	if ( ber_scanf( ber, "{a" /*}*/, &f->f_sub_type ) == LBER_ERROR ) {
+		return( -1 );
 	}
 	attr_normalize( f->f_sub_type );
 	syntax = attr_syntax( f->f_sub_type );
@@ -249,15 +241,11 @@ get_substring_filter(
 	*fstr = ch_malloc( strlen( f->f_sub_type ) + 3 );
 	sprintf( *fstr, "(%s=", f->f_sub_type );
 	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
-	    tag = ber_next_element( ber, &len, last ) ) {
-#ifdef LDAP_COMPAT30
-		if ( conn->c_version == 30 ) {
-			rc = ber_scanf( ber, "{a}", &val );
-		} else
-#endif
-			rc = ber_scanf( ber, "a", &val );
+	    tag = ber_next_element( ber, &len, last ) )
+	{
+		rc = ber_scanf( ber, "a", &val );
 		if ( rc == LBER_ERROR ) {
-			return( LDAP_PROTOCOL_ERROR );
+			return( -1 );
 		}
 		if ( val == NULL || *val == '\0' ) {
 			if ( val != NULL ) {
@@ -268,9 +256,6 @@ get_substring_filter(
 		value_normalize( val, syntax );
 
 		switch ( tag ) {
-#ifdef LDAP_COMPAT30
-		case LDAP_SUBSTRING_INITIAL_30:
-#endif
 		case LDAP_SUBSTRING_INITIAL:
 			Debug( LDAP_DEBUG_FILTER, "  INITIAL\n", 0, 0, 0 );
 			if ( f->f_sub_initial != NULL ) {
@@ -282,9 +267,6 @@ get_substring_filter(
 			strcat( *fstr, val );
 			break;
 
-#ifdef LDAP_COMPAT30
-		case LDAP_SUBSTRING_ANY_30:
-#endif
 		case LDAP_SUBSTRING_ANY:
 			Debug( LDAP_DEBUG_FILTER, "  ANY\n", 0, 0, 0 );
 			charray_add( &f->f_sub_any, val );
@@ -294,9 +276,6 @@ get_substring_filter(
 			strcat( *fstr, val );
 			break;
 
-#ifdef LDAP_COMPAT30
-		case LDAP_SUBSTRING_FINAL_30:
-#endif
 		case LDAP_SUBSTRING_FINAL:
 			Debug( LDAP_DEBUG_FILTER, "  FINAL\n", 0, 0, 0 );
 			if ( f->f_sub_final != NULL ) {
@@ -322,7 +301,7 @@ get_substring_filter(
 	strcat( *fstr, ")" );
 
 	Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 );
-	return( 0 );
+	return( LDAP_SUCCESS );
 }
 
 void