fix for select_backend suggested G. Gombas (ITS 1090)

[openldap] / servers / slapd / str2filter.c

diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index 7af30358ea8aec9865ab219950f8fe2552807258..e0907a2534a07c43d3580cf0b394f387922f977c 100644 (file)
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -1,7 +1,7 @@
 /* str2filter.c - parse an rfc 1588 string filter */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -27,7 +27,13 @@ str2filter( const char *str )
        Filter  *f = NULL;
        char    *end, *freeme;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "str2filter: \"%s\"\n", str ));
+#else
        Debug( LDAP_DEBUG_FILTER, "str2filter \"%s\"\n", str, 0, 0 );
+#endif
+
 
        if ( str == NULL || *str == '\0' ) {
                return( NULL );
@@ -47,32 +53,56 @@ str2filter( const char *str )
                str++;
                switch ( *str ) {
                case '&':
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                                  "str2filter:  AND\n" ));
+#else
                        Debug( LDAP_DEBUG_FILTER, "str2filter: AND\n",
                            0, 0, 0 );
+#endif
+
 
                        str++;
                        f = str2list( str, LDAP_FILTER_AND );
                        break;
 
                case '|':
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                                  "str2filter:  OR\n" ));
+#else
                        Debug( LDAP_DEBUG_FILTER, "put_filter: OR\n",
                            0, 0, 0 );
+#endif
+
 
                        str++;
                        f = str2list( str, LDAP_FILTER_OR );
                        break;
 
                case '!':
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                                  "str2filter:  NOT\n" ));
+#else
                        Debug( LDAP_DEBUG_FILTER, "put_filter: NOT\n",
                            0, 0, 0 );
+#endif
+
 
                        str++;
                        f = str2list( str, LDAP_FILTER_NOT );
                        break;
 
                default:
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                                  "str2filter:  simple\n" ));
+#else
                        Debug( LDAP_DEBUG_FILTER, "str2filter: simple\n",
                            0, 0, 0 );
+#endif
+
 
                        f = str2simple( str );
                        break;
@@ -81,8 +111,14 @@ str2filter( const char *str )
                break;
 
        default:        /* assume it's a simple type=value filter */
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "str2filter: default\n" ));
+#else
                Debug( LDAP_DEBUG_FILTER, "str2filter: default\n", 0, 0,
                    0 );
+#endif
+
 
                f = str2simple( str );
                break;
@@ -104,7 +140,13 @@ str2list( const char *str, unsigned long ftype )
        char    *next;
        char    save;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "str2list: \"%s\"\n", str ));
+#else
        Debug( LDAP_DEBUG_FILTER, "str2list \"%s\"\n", str, 0, 0 );
+#endif
+
 
        f = (Filter *) ch_calloc( 1, sizeof(Filter) );
        f->f_choice = ftype;
@@ -145,14 +187,23 @@ str2simple( const char *str )
        Filter          *f;
        char            *s;
        char            *value, savechar;
+       int                     rc;
+       const char              *text;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "str2simple:  \"%s\"\n", str ));
+#else
        Debug( LDAP_DEBUG_FILTER, "str2simple \"%s\"\n", str, 0, 0 );
+#endif
+
 
        if ( (s = strchr( str, '=' )) == NULL ) {
                return( NULL );
        }
        value = &s[1];
-       *s-- = '\0';
+
+       *s-- = '\0';    /* we shouldn't be mucking with str */
        savechar = *s;
 
        f = (Filter *) ch_calloc( 1, sizeof(Filter) );
@@ -173,6 +224,7 @@ str2simple( const char *str )
        case ':':
                f->f_choice = LDAP_FILTER_EXT;
                *s = '\0';
+               return NULL;
                break;
 
        default:
@@ -182,8 +234,13 @@ str2simple( const char *str )
                        f->f_choice = LDAP_FILTER_PRESENT;
                } else {
                        f->f_choice = LDAP_FILTER_SUBSTRINGS;
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-                       f->f_sub_type = ch_strdup( str );
+                       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;
+                       }
                        if ( str2subvals( value, f ) != 0 ) {
                                filter_free( f );
                                *(value-1) = '=';
@@ -191,24 +248,37 @@ str2simple( const char *str )
                        }
                        *(value-1) = '=';
                        return( f );
-#endif
                }
                break;
        }
 
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
        if ( f->f_choice == LDAP_FILTER_PRESENT ) {
-               f->f_type = ch_strdup( str );
+               rc = slap_str2ad( str, &f->f_desc, &text );
+               if( rc != LDAP_SUCCESS ) {
+                       filter_free( f );
+                       *(value-1) = '=';
+                       return NULL;
+               }
        } 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 );
+               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 );
+                       *(value-1) = '=';
+                       return NULL;
+               }
+
+               tmp = ch_strdup( value );
+               ldap_pvt_filter_value_unescape( tmp );
+               f->f_av_value = ber_bvstr( tmp );
        }
 
        *s = savechar;
        *(value-1) = '=';
-#endif
+
        return( f );
 }
 
@@ -218,7 +288,13 @@ str2subvals( const char *in, Filter *f )
        char    *nextstar, *val, *freeme;
        int     gotstar;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "str2subvals: \"%s\"\n", in ));
+#else
        Debug( LDAP_DEBUG_FILTER, "str2subvals \"%s\"\n", in, 0, 0 );
+#endif
+
 
        if( in == NULL ) return 0;