X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fstr2filter.c;h=f21ffd2d7fb13a47883c107b1ec0cb281fdaa894;hb=517fa54bb0f764968ca56e7931a09adac4f33af6;hp=4b371f46d0ab62f3da98c68603e41a5c23907b34;hpb=ae7d89fa1e98eebb5e123569ac7c698bf1fc6af2;p=openldap

diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index 4b371f46d0..f21ffd2d7f 100644
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -145,10 +145,8 @@ str2simple( const char *str )
 	Filter		*f;
 	char		*s;
 	char		*value, savechar;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 	int			rc;
-	char		*text;
-#endif
+	const char		*text;
 
 	Debug( LDAP_DEBUG_FILTER, "str2simple \"%s\"\n", str, 0, 0 );
 
@@ -178,6 +176,7 @@ str2simple( const char *str )
 	case ':':
 		f->f_choice = LDAP_FILTER_EXT;
 		*s = '\0';
+		return NULL;
 		break;
 
 	default:
@@ -187,16 +186,13 @@ str2simple( const char *str )
 			f->f_choice = LDAP_FILTER_PRESENT;
 		} else {
 			f->f_choice = LDAP_FILTER_SUBSTRINGS;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
+			f->f_sub = ch_calloc( 1, sizeof( SubstringsAssertion ) );
 			rc = slap_str2ad( str, &f->f_sub_desc, &text );
 			if( rc != LDAP_SUCCESS ) {
 				filter_free( f );
 				*(value-1) = '=';
 				return NULL;
 			}
-#else
-			f->f_sub_type = ch_strdup( str );
-#endif
 			if ( str2subvals( value, f ) != 0 ) {
 				filter_free( f );
 				*(value-1) = '=';
@@ -209,20 +205,17 @@ str2simple( const char *str )
 	}
 
 	if ( f->f_choice == LDAP_FILTER_PRESENT ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 		rc = slap_str2ad( str, &f->f_desc, &text );
 		if( rc != LDAP_SUCCESS ) {
 			filter_free( f );
 			*(value-1) = '=';
 			return NULL;
 		}
-#else
-		f->f_type = ch_strdup( str );
-#endif
 	} else {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 		char *tmp;
 
+		f->f_ava = ch_calloc( 1, sizeof( AttributeAssertion ) );
+		f->f_av_desc = NULL;
 		rc = slap_str2ad( str, &f->f_av_desc, &text );
 		if( rc != LDAP_SUCCESS ) {
 			filter_free( f );
@@ -233,12 +226,6 @@ str2simple( const char *str )
 		tmp = ch_strdup( value );
 		ldap_pvt_filter_value_unescape( tmp );
 		f->f_av_value = ber_bvstr( tmp );
-#else
-		f->f_avtype = ch_strdup( str );
-		f->f_avvalue.bv_val = ch_strdup( value );
-		ldap_pvt_filter_value_unescape( f->f_avvalue.bv_val );
-		f->f_avvalue.bv_len = strlen( value );
-#endif
 	}
 
 	*s = savechar;