liberally accept many LDAPv2/LDAPv3 stuff in DN (quoted parts, ';' as rdn separator...

[openldap] / servers / slapd / filter.c

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index efffa483885eca36ba2f0a619270c1dd9171f2cd..a0d51a4b72015fd06c2de5dda8b847566190bf2e 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -118,11 +118,11 @@ get_filter(
                filter_escape_value( f->f_av_value, &escaped );
 
                *fstr = ch_malloc( sizeof("(=)")
-                       + f->f_av_desc->ad_cname->bv_len
+                       + f->f_av_desc->ad_cname.bv_len
                        + escaped.bv_len );
 
                sprintf( *fstr, "(%s=%s)",
-                       f->f_av_desc->ad_cname->bv_val,
+                       f->f_av_desc->ad_cname.bv_val,
                    escaped.bv_val );
 
                ber_memfree( escaped.bv_val );
@@ -153,11 +153,11 @@ get_filter(
                filter_escape_value( f->f_av_value, &escaped );
 
                *fstr = ch_malloc( sizeof("(>=)")
-                       + f->f_av_desc->ad_cname->bv_len
+                       + f->f_av_desc->ad_cname.bv_len
                        + escaped.bv_len );
 
                sprintf( *fstr, "(%s>=%s)",
-                       f->f_av_desc->ad_cname->bv_val,
+                       f->f_av_desc->ad_cname.bv_val,
                    escaped.bv_val );
 
                ber_memfree( escaped.bv_val );
@@ -179,11 +179,11 @@ get_filter(
                filter_escape_value( f->f_av_value, &escaped );
 
                *fstr = ch_malloc( sizeof("(<=)")
-                       + f->f_av_desc->ad_cname->bv_len
+                       + f->f_av_desc->ad_cname.bv_len
                        + escaped.bv_len );
 
                sprintf( *fstr, "(%s<=%s)",
-                       f->f_av_desc->ad_cname->bv_val,
+                       f->f_av_desc->ad_cname.bv_val,
                    escaped.bv_val );
 
                ber_memfree( escaped.bv_val );
@@ -208,16 +208,21 @@ get_filter(
                err = slap_bv2ad( &type, &f->f_desc, text );
 
                if( err != LDAP_SUCCESS ) {
+                       /* unrecognized attribute description or other error */
+                       f->f_choice = SLAPD_FILTER_COMPUTED;
+                       f->f_result = LDAP_COMPARE_FALSE;
+                       *fstr = ch_strdup( "(unrecogized=*)" );
                        ch_free( type.bv_val );
+                       err = LDAP_SUCCESS;
                        break;
                }
 
                ch_free( type.bv_val );
 
                *fstr = ch_malloc( sizeof("(=*)")
-                       + f->f_desc->ad_cname->bv_len );
+                       + f->f_desc->ad_cname.bv_len );
                sprintf( *fstr, "(%s=*)",
-                       f->f_desc->ad_cname->bv_val );
+                       f->f_desc->ad_cname.bv_val );
 
                } break;
 
@@ -236,11 +241,11 @@ get_filter(
                filter_escape_value( f->f_av_value, &escaped );
 
                *fstr = ch_malloc( sizeof("(~=)")
-                       + f->f_av_desc->ad_cname->bv_len
+                       + f->f_av_desc->ad_cname.bv_len
                        + escaped.bv_len );
 
                sprintf( *fstr, "(%s~=%s)",
-                       f->f_av_desc->ad_cname->bv_val,
+                       f->f_av_desc->ad_cname.bv_val,
                    escaped.bv_val );
 
                ber_memfree( escaped.bv_val );
@@ -316,12 +321,12 @@ get_filter(
                filter_escape_value( f->f_mr_value, &escaped );
 
                *fstr = ch_malloc( sizeof("(:dn::=)")
-                       + (f->f_mr_desc ? f->f_mr_desc->ad_cname->bv_len : 0)
+                       + (f->f_mr_desc ? f->f_mr_desc->ad_cname.bv_len : 0)
                        + (f->f_mr_rule_text ? strlen(f->f_mr_rule_text) : 0)
                        + escaped.bv_len );
 
                sprintf( *fstr, "(%s%s%s%s:=%s)",
-                        (f->f_mr_desc ? f->f_mr_desc->ad_cname->bv_val : ""),
+                        (f->f_mr_desc ? f->f_mr_desc->ad_cname.bv_val : ""),
                         (f->f_mr_dnattrs ? ":dn" : ""),
                         (f->f_mr_rule_text ? ":" : ""),
                         (f->f_mr_rule_text ? f->f_mr_rule_text : ""),
@@ -331,7 +336,7 @@ get_filter(
                break;
 
        default:
-               (void) ber_skip_tag( ber, &len );
+               (void) ber_scanf( ber, "x" ); /* skip the element */
 #ifdef NEW_LOGGING
                LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
                           "get_filter: conn %d unknown filter type=%lu\n",
@@ -370,7 +375,7 @@ get_filter(
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2,
-                  "get_filter: conn %d  exit\n", conn->c_connid ));
+               "get_filter: conn %d exit\n", conn->c_connid ));
 #else
        Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 );
 #endif
@@ -474,8 +479,8 @@ get_substring_filter(
 
        if( fstr ) {
                *fstr = ch_malloc( sizeof("(=" /*)*/) +
-                       f->f_sub_desc->ad_cname->bv_len );
-               sprintf( *fstr, "(%s=" /*)*/, f->f_sub_desc->ad_cname->bv_val );
+                       f->f_sub_desc->ad_cname.bv_len );
+               sprintf( *fstr, "(%s=" /*)*/, f->f_sub_desc->ad_cname.bv_val );
        }
 
        for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
@@ -646,7 +651,6 @@ return_error:
                                *fstr = NULL;
                        }
 
-                       ad_free( f->f_sub_desc, 1 );
                        ber_bvfree( f->f_sub_initial );
                        ber_bvecfree( f->f_sub_any );
                        ber_bvfree( f->f_sub_final );
@@ -683,7 +687,6 @@ filter_free( Filter *f )
 
        switch ( f->f_choice ) {
        case LDAP_FILTER_PRESENT:
-               ad_free( f->f_desc, 1 );
                break;
 
        case LDAP_FILTER_EQUALITY:
@@ -694,7 +697,6 @@ filter_free( Filter *f )
                break;
 
        case LDAP_FILTER_SUBSTRINGS:
-               ad_free( f->f_sub_desc, 1 );
                if ( f->f_sub_initial != NULL ) {
                        ber_bvfree( f->f_sub_initial );
                }
@@ -702,6 +704,7 @@ filter_free( Filter *f )
                if ( f->f_sub_final != NULL ) {
                        ber_bvfree( f->f_sub_final );
                }
+               ch_free( f->f_sub );
                break;
 
        case LDAP_FILTER_AND:
@@ -746,7 +749,7 @@ filter_print( Filter *f )
        case LDAP_FILTER_EQUALITY:
                filter_escape_value( f->f_av_value, &escaped );
                fprintf( stderr, "(%s=%s)",
-                       f->f_av_desc->ad_cname->bv_val,
+                       f->f_av_desc->ad_cname.bv_val,
                    escaped.bv_val );
                ber_memfree( escaped.bv_val );
                break;
@@ -754,7 +757,7 @@ filter_print( Filter *f )
        case LDAP_FILTER_GE:
                filter_escape_value( f->f_av_value, &escaped );
                fprintf( stderr, "(%s>=%s)",
-                       f->f_av_desc->ad_cname->bv_val,
+                       f->f_av_desc->ad_cname.bv_val,
                    escaped.bv_val );
                ber_memfree( escaped.bv_val );
                break;
@@ -762,7 +765,7 @@ filter_print( Filter *f )
        case LDAP_FILTER_LE:
                filter_escape_value( f->f_av_value, &escaped );
                fprintf( stderr, "(%s<=%s)",
-                       f->f_ava->aa_desc->ad_cname->bv_val,
+                       f->f_ava->aa_desc->ad_cname.bv_val,
                    escaped.bv_val );
                ber_memfree( escaped.bv_val );
                break;
@@ -770,14 +773,14 @@ filter_print( Filter *f )
        case LDAP_FILTER_APPROX:
                filter_escape_value( f->f_av_value, &escaped );
                fprintf( stderr, "(%s~=%s)",
-                       f->f_ava->aa_desc->ad_cname->bv_val,
+                       f->f_ava->aa_desc->ad_cname.bv_val,
                    escaped.bv_val );
                ber_memfree( escaped.bv_val );
                break;
 
        case LDAP_FILTER_SUBSTRINGS:
                fprintf( stderr, "(%s=" /*)*/,
-                       f->f_sub_desc->ad_cname->bv_val );
+                       f->f_sub_desc->ad_cname.bv_val );
                if ( f->f_sub_initial != NULL ) {
                        filter_escape_value( f->f_sub_initial, &escaped );
                        fprintf( stderr, "%s",
@@ -803,7 +806,7 @@ filter_print( Filter *f )
 
        case LDAP_FILTER_PRESENT:
                fprintf( stderr, "(%s=*)",
-                       f->f_desc->ad_cname->bv_val );
+                       f->f_desc->ad_cname.bv_val );
                break;
 
        case LDAP_FILTER_AND: