Add OpenLDAP RCSid

[openldap] / servers / slapd / str2filter.c

diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index 3fce185f77bd49a5f5953d651ad08b04c91702d7..cc98593519548c68ed085d21eaa82616b8157f37 100644 (file)
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -1,4 +1,9 @@
 /* str2filter.c - parse an rfc 1588 string filter */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -9,6 +14,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
+#include <ldap_pvt.h>
 
 static char    *find_matching_paren(char *s);
 static Filter  *str2list(char *str, long unsigned int ftype);
@@ -19,7 +25,7 @@ Filter *
 str2filter( char *str )
 {
        Filter  *f = NULL;
-       char    *end;
+       char    *end, *freeme;
 
        Debug( LDAP_DEBUG_FILTER, "str2filter \"%s\"\n", str, 0, 0 );
 
@@ -27,10 +33,13 @@ str2filter( char *str )
                return( NULL );
        }
 
+       str = freeme = ch_strdup( str );
+
        switch ( *str ) {
        case '(':
                if ( (end = find_matching_paren( str )) == NULL ) {
                        filter_free( f );
+                       free( freeme );
                        return( NULL );
                }
                *end = '\0';
@@ -79,6 +88,7 @@ str2filter( char *str )
                break;
        }
 
+       free( freeme );
        return( f );
 }
 
@@ -161,7 +171,7 @@ str2simple( char *str )
                *s = '\0';
                break;
        default:
-               if ( strchr( value, '*' ) == NULL ) {
+               if ( ldap_pvt_find_wildcard( value ) == NULL ) {
                        f->f_choice = LDAP_FILTER_EQUALITY;
                } else if ( strcmp( value, "*" ) == 0 ) {
                        f->f_choice = LDAP_FILTER_PRESENT;
@@ -184,6 +194,7 @@ str2simple( char *str )
        } 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 );
        }
 
@@ -195,30 +206,31 @@ str2simple( char *str )
 static int
 str2subvals( char *val, Filter *f )
 {
-       char    *nextstar;
+       char    *nextstar, *freeme;
        int     gotstar;
 
        Debug( LDAP_DEBUG_FILTER, "str2subvals \"%s\"\n", val, 0, 0 );
 
+       val = freeme = ch_strdup( val );
        gotstar = 0;
        while ( val != NULL && *val ) {
-               if ( (nextstar = strchr( val, '*' )) != NULL )
+               if ( (nextstar = ldap_pvt_find_wildcard( val )) != NULL )
                        *nextstar++ = '\0';
 
+               ldap_pvt_filter_value_unescape( val );
                if ( gotstar == 0 ) {
                        f->f_sub_initial = ch_strdup( val );
                } else if ( nextstar == NULL ) {
                        f->f_sub_final = ch_strdup( val );
                } else {
-                       charray_add( &f->f_sub_any, ch_strdup( val ) );
+                       charray_add( &f->f_sub_any, val );
                }
 
                gotstar = 1;
-               if ( nextstar != NULL )
-                       *(nextstar-1) = '*';
                val = nextstar;
        }
 
+       free( freeme );
        return( 0 );
 }