]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/filter.c
projects / openldap / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use defined Root DSE attributes.
[openldap] / servers / slapd / filter.c
diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 66ea86a81e12504764826c30c10812cfa153aaa8..b06f3459357c70dd704ffdb7666e7352e4e930c2 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -48,8 +48,8 @@ get_filter(
        struct berval escaped;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, "get_filter: conn %d\n",
-                   conn->c_connid ));
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, "get_filter: conn %d\n",
+                  conn->c_connid ));
 #else
        Debug( LDAP_DEBUG_FILTER, "begin get_filter\n", 0, 0, 0 );
 #endif
@@ -69,19 +69,19 @@ get_filter(
         *      }
         *
         *      SubstringFilter ::= SEQUENCE {
-        *              type               AttributeType,
+        *              type               AttributeType,
         *              SEQUENCE OF CHOICE {
-        *                      initial          [0] IA5String,
-        *                      any              [1] IA5String,
-        *                      final            [2] IA5String
+        *                      initial          [0] IA5String,
+        *                      any              [1] IA5String,
+        *                      final            [2] IA5String
         *              }
         *      }
         *
-     *  MatchingRuleAssertion ::= SEQUENCE {
-     *          matchingRule    [1] MatchingRuleId OPTIONAL,
-     *          type            [2] AttributeDescription OPTIONAL,
-     *          matchValue      [3] AssertionValue,
-     *          dnAttributes    [4] BOOLEAN DEFAULT FALSE
+     * MatchingRuleAssertion ::= SEQUENCE {
+     *         matchingRule    [1] MatchingRuleId OPTIONAL,
+     *         type            [2] AttributeDescription OPTIONAL,
+     *         matchValue      [3] AssertionValue,
+     *         dnAttributes    [4] BOOLEAN DEFAULT FALSE
         *      }
         *
         */
@@ -103,8 +103,8 @@ get_filter(
        switch ( f->f_choice ) {
        case LDAP_FILTER_EQUALITY:
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2,
-                       "get_filter: conn %d  EQUALITY\n", conn->c_connid ));
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2,
+                          "get_filter: conn %d  EQUALITY\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
 #endif
@@ -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 );
@@ -130,8 +130,8 @@ get_filter(
 
        case LDAP_FILTER_SUBSTRINGS:
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_filter: conn %d  SUBSTRINGS\n", conn->c_connid ));
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "get_filter: conn %d  SUBSTRINGS\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
 #endif
@@ -140,8 +140,8 @@ get_filter(
 
        case LDAP_FILTER_GE:
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_filter: conn %d  GE\n", conn->c_connid ));
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "get_filter: conn %d  GE\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
 #endif
@@ -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 );
@@ -165,8 +165,8 @@ get_filter(
 
        case LDAP_FILTER_LE:
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_filter: conn %d  LE\n", conn->c_connid ));
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "get_filter: conn %d  LE\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
 #endif
@@ -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 );
@@ -193,8 +193,8 @@ get_filter(
                struct berval type;
 
 #ifdef NEW_LOGGING
-                LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                           "get_filter: conn %d PRESENT\n", conn->c_connid ));
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "get_filter: conn %d PRESENT\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
 #endif
@@ -215,16 +215,16 @@ get_filter(
                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;
 
        case LDAP_FILTER_APPROX:
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_filter: conn %d  APPROX\n", conn->c_connid ));
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "get_filter: conn %d  APPROX\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
 #endif
@@ -236,11 +236,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 );
@@ -248,8 +248,8 @@ get_filter(
 
        case LDAP_FILTER_AND:
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_filter: conn %d  AND\n", conn->c_connid ));
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "get_filter: conn %d  AND\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 );
 #endif
@@ -265,8 +265,8 @@ get_filter(
 
        case LDAP_FILTER_OR:
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_filter: conn %d  OR\n", conn->c_connid  ));
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "get_filter: conn %d  OR\n", conn->c_connid  ));
 #else
                Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 );
 #endif
@@ -282,8 +282,8 @@ get_filter(
 
        case LDAP_FILTER_NOT:
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_filter: conn %d  NOT\n", conn->c_connid ));
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "get_filter: conn %d  NOT\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 );
 #endif
@@ -300,8 +300,8 @@ get_filter(
 
        case LDAP_FILTER_EXT:
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_filter: conn %d  EXTENSIBLE\n", conn->c_connid ));
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "get_filter: conn %d  EXTENSIBLE\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );
 #endif
@@ -316,12 +316,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,11 +331,11 @@ 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",
-                           conn->c_connid, f->f_choice ));
+               LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
+                          "get_filter: conn %d unknown filter type=%lu\n",
+                          conn->c_connid, f->f_choice ));
 #else
                Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n",
                       f->f_choice, 0, 0 );
@@ -369,8 +369,8 @@ get_filter(
        }
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2,
-                   "get_filter: conn %d  exit\n", conn->c_connid ));
+       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2,
+                  "get_filter: conn %d  exit\n", conn->c_connid ));
 #else
        Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 );
 #endif
@@ -389,8 +389,8 @@ get_filter_list( Connection *conn, BerElement *ber,
        char            *last, *ftmp;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
-                   "get_filter_list: conn %d start\n", conn->c_connid ));
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "get_filter_list: conn %d start\n", conn->c_connid ));
 #else
        Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 );
 #endif
@@ -416,8 +416,8 @@ get_filter_list( Connection *conn, BerElement *ber,
        *new = NULL;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
-                   "get_filter_list: conn %d exit\n", conn->c_connid ));
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "get_filter_list: conn %d exit\n", conn->c_connid ));
 #else
        Debug( LDAP_DEBUG_FILTER, "end get_filter_list\n", 0, 0, 0 );
 #endif
@@ -444,8 +444,8 @@ get_substring_filter(
        *text = "error decoding filter";
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
-                   "get_substring_filter: conn %d  begin\n", conn->c_connid ));
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "get_substring_filter: conn %d  begin\n", conn->c_connid ));
 #else
        Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
 #endif
@@ -474,8 +474,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;
@@ -512,9 +512,9 @@ get_substring_filter(
                        rc = LDAP_PROTOCOL_ERROR;
 
 #ifdef NEW_LOGGING
-                        LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
-                                   "get_filter_substring: conn %d  unknown substring choice=%ld\n",
-                                   conn->c_connid, (long)tag ));
+                       LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
+                                  "get_filter_substring: conn %d  unknown substring choice=%ld\n",
+                                  conn->c_connid, (long)tag ));
 #else
                        Debug( LDAP_DEBUG_FILTER,
                                "  unknown substring choice=%ld\n",
@@ -538,13 +538,17 @@ get_substring_filter(
                switch ( tag ) {
                case LDAP_SUBSTRING_INITIAL:
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                               "get_substring_filter: conn %d  INITIAL\n",
-                               conn->c_connid ));
+                       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                                  "get_substring_filter: conn %d  INITIAL\n",
+                                  conn->c_connid ));
 #else
                        Debug( LDAP_DEBUG_FILTER, "  INITIAL\n", 0, 0, 0 );
 #endif
-                       if ( f->f_sub_initial != NULL ) {
+
+                       if ( f->f_sub_initial != NULL
+                               || f->f_sub_any != NULL 
+                               || f->f_sub_final != NULL )
+                       {
                                ber_bvfree( value );
                                goto return_error;
                        }
@@ -562,12 +566,18 @@ get_substring_filter(
 
                case LDAP_SUBSTRING_ANY:
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                               "get_substring_filter: conn %d  ANY\n",
-                               conn->c_connid ));
+                       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                                  "get_substring_filter: conn %d  ANY\n",
+                                  conn->c_connid ));
 #else
                        Debug( LDAP_DEBUG_FILTER, "  ANY\n", 0, 0, 0 );
 #endif
+
+                       if ( f->f_sub_final != NULL ) {
+                               ber_bvfree( value );
+                               goto return_error;
+                       }
+
                        if( ber_bvecadd( &f->f_sub_any, value ) < 0 ) {
                                ber_bvfree( value );
                                goto return_error;
@@ -585,16 +595,18 @@ get_substring_filter(
 
                case LDAP_SUBSTRING_FINAL:
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                               "get_substring_filter: conn %d  FINAL\n",
-                               conn->c_connid ));
+                       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                                  "get_substring_filter: conn %d  FINAL\n",
+                                  conn->c_connid ));
 #else
                        Debug( LDAP_DEBUG_FILTER, "  FINAL\n", 0, 0, 0 );
 #endif
+
                        if ( f->f_sub_final != NULL ) {
                                ber_bvfree( value );
                                goto return_error;
                        }
+
                        f->f_sub_final = value;
 
                        if( fstr ) {
@@ -609,9 +621,9 @@ get_substring_filter(
 
                default:
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
-                               "get_substring_filter: conn %d  unknown substring type %ld\n",
-                               conn->c_connid, (long)tag ));
+                       LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
+                                  "get_substring_filter: conn %d  unknown substring type %ld\n",
+                                  conn->c_connid, (long)tag ));
 #else
                        Debug( LDAP_DEBUG_FILTER,
                                "  unknown substring type=%ld\n",
@@ -622,9 +634,9 @@ get_substring_filter(
 
 return_error:
 #ifdef NEW_LOGGING
-                        LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
-                                   "get_substring_filter: conn %d  error %ld\n",
-                                   conn->c_connid, (long)rc ));
+                       LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
+                                  "get_substring_filter: conn %d  error %ld\n",
+                                  conn->c_connid, (long)rc ));
 #else
                        Debug( LDAP_DEBUG_FILTER, "  error=%ld\n",
                                (long) rc, 0, 0 );
@@ -634,7 +646,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 );
@@ -652,8 +663,8 @@ return_error:
        }
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
-                   "get_substring_filter: conn %d exit\n", conn->c_connid ));
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "get_substring_filter: conn %d exit\n", conn->c_connid ));
 #else
        Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 );
 #endif
@@ -671,7 +682,6 @@ filter_free( Filter *f )
 
        switch ( f->f_choice ) {
        case LDAP_FILTER_PRESENT:
-               ad_free( f->f_desc, 1 );
                break;
 
        case LDAP_FILTER_EQUALITY:
@@ -682,7 +692,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 );
                }
@@ -690,6 +699,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:
@@ -706,8 +716,8 @@ filter_free( Filter *f )
 
        default:
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
-                       "filter_free: unknown filter type %lu\n", f->f_choice ));
+               LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
+                          "filter_free: unknown filter type %lu\n", f->f_choice ));
 #else
                Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n",
                       f->f_choice, 0, 0 );
@@ -734,7 +744,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;
@@ -742,7 +752,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;
@@ -750,7 +760,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;
@@ -758,14 +768,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",
@@ -791,7 +801,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:
Cloned from git://git.openldap.org/openldap.git