Don't reeval expression

[openldap] / servers / slapd / filter.c

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index dc6359619dc0767101a376644d77adec97cd0843..63975090bcad9e121b695033a9048b44e14ba4cf 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -54,8 +54,7 @@ get_filter(
        Filter          *f;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, "get_filter: conn %d\n",
-               conn->c_connid ));
+       LDAP_LOG( FILTER, ENTRY, "get_filter: conn %d\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "begin get_filter\n", 0, 0, 0 );
 #endif
@@ -71,7 +70,7 @@ get_filter(
         *              lessOrEqual     [6]     AttributeValueAssertion,
         *              present         [7]     AttributeType,,
         *              approxMatch     [8]     AttributeValueAssertion
-        *              extensibleMatch [9] MatchingRuleAssertion
+        *              extensibleMatch [9]     MatchingRuleAssertion
         *      }
         *
         *      SubstringFilter ::= SEQUENCE {
@@ -108,8 +107,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, DETAIL2, 
+                       "get_filter: conn %d  EQUALITY\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
 #endif
@@ -123,8 +122,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, DETAIL1, 
+                       "get_filter: conn %d  SUBSTRINGS\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
 #endif
@@ -133,8 +132,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, DETAIL1, 
+                       "get_filter: conn %d  GE\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
 #endif
@@ -146,8 +145,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, DETAIL1, 
+                       "get_filter: conn %d  LE\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
 #endif
@@ -161,8 +160,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, DETAIL1, 
+                       "get_filter: conn %d PRESENT\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
 #endif
@@ -186,8 +185,8 @@ get_filter(
 
        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, DETAIL1, 
+                       "get_filter: conn %d  APPROX\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
 #endif
@@ -199,8 +198,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, DETAIL1, 
+                       "get_filter: conn %d  AND\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 );
 #endif
@@ -212,8 +211,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, DETAIL1, 
+                       "get_filter: conn %d  OR\n", conn->c_connid, 0, 0  );
 #else
                Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 );
 #endif
@@ -225,8 +224,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, DETAIL1, 
+                       "get_filter: conn %d  NOT\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 );
 #endif
@@ -239,8 +238,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, DETAIL1, 
+                       "get_filter: conn %d  EXTENSIBLE\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );
 #endif
@@ -256,9 +255,9 @@ get_filter(
        default:
                (void) ber_scanf( ber, "x" ); /* skip the element */
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
+               LDAP_LOG( FILTER, ERR, 
                        "get_filter: conn %d unknown filter type=%lu\n",
-                       conn->c_connid, f->f_choice ));
+                       conn->c_connid, f->f_choice, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n",
                        f->f_choice, 0, 0 );
@@ -285,8 +284,8 @@ get_filter(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2,
-               "get_filter: conn %d exit\n", conn->c_connid ));
+       LDAP_LOG( FILTER, DETAIL2, 
+               "get_filter: conn %d exit\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 );
 #endif
@@ -305,8 +304,8 @@ get_filter_list( Connection *conn, BerElement *ber,
        char            *last;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
-               "get_filter_list: conn %d start\n", conn->c_connid ));
+       LDAP_LOG( FILTER, ENTRY, 
+               "get_filter_list: conn %d start\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 );
 #endif
@@ -322,8 +321,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, ENTRY, 
+               "get_filter_list: conn %d exit\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "end get_filter_list\n", 0, 0, 0 );
 #endif
@@ -346,8 +345,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, ENTRY, 
+               "get_substring_filter: conn %d  begin\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
 #endif
@@ -404,9 +403,9 @@ get_substring_filter(
                        rc = LDAP_PROTOCOL_ERROR;
 
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
+                       LDAP_LOG( FILTER, ERR,
                                "get_filter_substring: conn %d  unknown substring choice=%ld\n",
-                               conn->c_connid, (long)tag ));
+                               conn->c_connid, (long)tag, 0 );
 #else
                        Debug( LDAP_DEBUG_FILTER,
                                "  unknown substring choice=%ld\n",
@@ -415,7 +414,7 @@ get_substring_filter(
                        goto return_error;
                }
 
-               /* valiate using equality matching rule validator! */
+               /* validate using equality matching rule validator! */
                rc = value_validate( f->f_sub_desc->ad_type->sat_equality,
                        &value, text );
                if( rc != LDAP_SUCCESS ) {
@@ -435,9 +434,8 @@ 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, DETAIL1,
+                               "get_substring_filter: conn %d  INITIAL\n", conn->c_connid, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_FILTER, "  INITIAL\n", 0, 0, 0 );
 #endif
@@ -455,9 +453,8 @@ 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, DETAIL1,
+                               "get_substring_filter: conn %d  ANY\n", conn->c_connid, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_FILTER, "  ANY\n", 0, 0, 0 );
 #endif
@@ -472,9 +469,8 @@ 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, DETAIL1, 
+                               "get_substring_filter: conn %d  FINAL\n", conn->c_connid, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_FILTER, "  FINAL\n", 0, 0, 0 );
 #endif
@@ -489,9 +485,9 @@ get_substring_filter(
 
                default:
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
+                       LDAP_LOG( FILTER, INFO, 
                                "get_substring_filter: conn %d  unknown substring type %ld\n",
-                               conn->c_connid, (long)tag ));
+                               conn->c_connid, (long)tag, 0 );
 #else
                        Debug( LDAP_DEBUG_FILTER,
                                "  unknown substring type=%ld\n",
@@ -502,9 +498,9 @@ get_substring_filter(
 
 return_error:
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
+                       LDAP_LOG( FILTER, INFO, 
                                "get_substring_filter: conn %d  error %ld\n",
-                               conn->c_connid, (long)rc ));
+                               conn->c_connid, (long)rc, 0 );
 #else
                        Debug( LDAP_DEBUG_FILTER, "  error=%ld\n",
                                (long) rc, 0, 0 );
@@ -518,8 +514,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, ENTRY, 
+               "get_substring_filter: conn %d exit\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 );
 #endif
@@ -575,8 +571,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, ERR, 
+                       "filter_free: unknown filter type %lu\n", f->f_choice, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n",
                        f->f_choice, 0, 0 );
@@ -746,23 +742,31 @@ filter2bv( Filter *f, struct berval *fstr )
 
                break;
 
-       case LDAP_FILTER_EXT:
+       case LDAP_FILTER_EXT: {
+               struct berval ad;
                filter_escape_value( &f->f_mr_value, &tmp );
 
-               fstr->bv_len = f->f_mr_desc->ad_cname.bv_len +
+               if ( f->f_mr_desc ) {
+                       ad = f->f_mr_desc->ad_cname;
+               } else {
+                       ad.bv_len = 0;
+                       ad.bv_val = "";
+               }
+                       
+               fstr->bv_len = ad.bv_len +
                        ( f->f_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +
                        ( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len+1 : 0 ) +
                        tmp.bv_len + ( sizeof("(:=)") - 1 );
                fstr->bv_val = malloc( fstr->bv_len + 1 );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",
-                       f->f_mr_desc->ad_cname.bv_val,
+                       ad.bv_val,
                        f->f_mr_dnattrs ? ":dn" : "",
                        f->f_mr_rule_text.bv_len ? ":" : "",
                        f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "",
                        tmp.bv_val );
                ber_memfree( tmp.bv_val );
-               break;
+               } break;
 
        case SLAPD_FILTER_COMPUTED:
                ber_str2bv(
@@ -821,8 +825,8 @@ get_simple_vrFilter(
        ValuesReturnFilter *f;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, "get_simple_vrFilter: conn %d\n",
-               conn->c_connid ));
+       LDAP_LOG( FILTER, ENTRY, 
+               "get_simple_vrFilter: conn %d\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "begin get_simple_vrFilter\n", 0, 0, 0 );
 #endif
@@ -843,8 +847,8 @@ get_simple_vrFilter(
        switch ( f->f_choice ) {
        case LDAP_FILTER_EQUALITY:
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2,
-                       "get_simple_vrFilter: conn %d  EQUALITY\n", conn->c_connid ));
+               LDAP_LOG( FILTER, DETAIL2, 
+                       "get_simple_vrFilter: conn %d  EQUALITY\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
 #endif
@@ -858,8 +862,8 @@ get_simple_vrFilter(
 
        case LDAP_FILTER_SUBSTRINGS:
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_simple_vrFilter: conn %d  SUBSTRINGS\n", conn->c_connid ));
+               LDAP_LOG( FILTER, DETAIL1, 
+                       "get_simple_vrFilter: conn %d  SUBSTRINGS\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
 #endif
@@ -868,8 +872,8 @@ get_simple_vrFilter(
 
        case LDAP_FILTER_GE:
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_simple_vrFilter: conn %d  GE\n", conn->c_connid ));
+               LDAP_LOG( FILTER, DETAIL1, 
+                       "get_simple_vrFilter: conn %d  GE\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
 #endif
@@ -881,8 +885,8 @@ get_simple_vrFilter(
 
        case LDAP_FILTER_LE:
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_simple_vrFilter: conn %d  LE\n", conn->c_connid ));
+               LDAP_LOG( FILTER, DETAIL1, 
+                       "get_simple_vrFilter: conn %d  LE\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
 #endif
@@ -896,8 +900,8 @@ get_simple_vrFilter(
                struct berval type;
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_simple_vrFilter: conn %d PRESENT\n", conn->c_connid ));
+               LDAP_LOG( FILTER, DETAIL1, 
+                       "get_simple_vrFilter: conn %d PRESENT\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
 #endif
@@ -921,8 +925,8 @@ get_simple_vrFilter(
 
        case LDAP_FILTER_APPROX:
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_simple_vrFilter: conn %d  APPROX\n", conn->c_connid ));
+               LDAP_LOG( FILTER, DETAIL1, 
+                       "get_simple_vrFilter: conn %d  APPROX\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
 #endif
@@ -934,8 +938,8 @@ get_simple_vrFilter(
 
        case LDAP_FILTER_EXT:
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
-                       "get_simple_vrFilter: conn %d  EXTENSIBLE\n", conn->c_connid ));
+               LDAP_LOG( FILTER, DETAIL1, 
+                       "get_simple_vrFilter: conn %d  EXTENSIBLE\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );
 #endif
@@ -951,9 +955,9 @@ get_simple_vrFilter(
        default:
                (void) ber_scanf( ber, "x" ); /* skip the element */
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
+               LDAP_LOG( FILTER, ERR, 
                        "get_simple_vrFilter: conn %d unknown filter type=%lu\n",
-                       conn->c_connid, f->f_choice ));
+                       conn->c_connid, f->f_choice, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "get_simple_vrFilter: unknown filter type=%lu\n",
                        f->f_choice, 0, 0 );
@@ -980,8 +984,8 @@ get_simple_vrFilter(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2,
-               "get_simple_vrFilter: conn %d exit\n", conn->c_connid ));
+       LDAP_LOG( FILTER, DETAIL2, 
+               "get_simple_vrFilter: conn %d exit\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "end get_simple_vrFilter %d\n", err, 0, 0 );
 #endif
@@ -1028,8 +1032,8 @@ get_vrFilter( Connection *conn, BerElement *ber,
        char            *last;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
-               "get_vrFilter: conn %d start\n", conn->c_connid ));
+       LDAP_LOG( FILTER, ENTRY, 
+               "get_vrFilter: conn %d start\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "begin get_vrFilter\n", 0, 0, 0 );
 #endif
@@ -1058,8 +1062,8 @@ get_vrFilter( Connection *conn, BerElement *ber,
        *new = NULL;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
-               "get_vrFilter: conn %d exit\n", conn->c_connid ));
+       LDAP_LOG( FILTER, ENTRY, 
+               "get_vrFilter: conn %d exit\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "end get_vrFilter\n", 0, 0, 0 );
 #endif
@@ -1109,8 +1113,8 @@ vrFilter_free( ValuesReturnFilter *f )
 
                default:
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
-                               "filter_free: unknown filter type %lu\n", f->f_choice ));
+                       LDAP_LOG( FILTER, ERR, 
+                               "filter_free: unknown filter type %lu\n", f->f_choice, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n",
                                f->f_choice, 0, 0 );
@@ -1126,7 +1130,6 @@ vrFilter_free( ValuesReturnFilter *f )
 void
 vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr )
 {
-       int     i;
        ValuesReturnFilter      *p;
        struct berval tmp;
        ber_len_t len;
@@ -1159,8 +1162,6 @@ vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr )
 static void
 simple_vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr )
 {
-       int     i;
-       ValuesReturnFilter      *p;
        struct berval tmp;
        ber_len_t len;
 
@@ -1249,6 +1250,7 @@ simple_vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr )
                }
 
                if ( f->f_sub_any != NULL ) {
+                       int i;
                        for ( i = 0; f->f_sub_any[i].bv_val != NULL; i++ ) {
                                len = fstr->bv_len;
                                filter_escape_value( &f->f_sub_any[i], &tmp );
@@ -1289,23 +1291,32 @@ simple_vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr )
                        f->f_desc->ad_cname.bv_val );
                break;
 
-       case LDAP_FILTER_EXT:
+       case LDAP_FILTER_EXT: {
+               struct berval ad;
                filter_escape_value( &f->f_mr_value, &tmp );
 
-               fstr->bv_len = f->f_mr_desc->ad_cname.bv_len +
+               if ( f->f_mr_desc ) {
+                       ad = f->f_mr_desc->ad_cname;
+               } else {
+                       ad.bv_len = 0;
+                       ad.bv_val = "";
+               }
+                       
+               fstr->bv_len = ad.bv_len +
                        ( f->f_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +
                        ( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len+1 : 0 ) +
                        tmp.bv_len + ( sizeof("(:=)") - 1 );
                fstr->bv_val = malloc( fstr->bv_len + 1 );
 
                snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",
-                       f->f_mr_desc->ad_cname.bv_val,
+                       ad.bv_val,
                        f->f_mr_dnattrs ? ":dn" : "",
                        f->f_mr_rule_text.bv_len ? ":" : "",
                        f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "",
                        tmp.bv_val );
+
                ber_memfree( tmp.bv_val );
-               break;
+               } break;
 
        case SLAPD_FILTER_COMPUTED:
                ber_str2bv(
@@ -1342,8 +1353,8 @@ get_substring_vrFilter(
        *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, ENTRY, 
+               "get_substring_filter: conn %d  begin\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
 #endif
@@ -1400,9 +1411,9 @@ get_substring_vrFilter(
                        rc = LDAP_PROTOCOL_ERROR;
 
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
+                       LDAP_LOG( FILTER, ERR, 
                                "get_filter_substring: conn %d  unknown substring choice=%ld\n",
-                               conn->c_connid, (long)tag ));
+                               conn->c_connid, (long)tag, 0 );
 #else
                        Debug( LDAP_DEBUG_FILTER,
                                "  unknown substring choice=%ld\n",
@@ -1431,9 +1442,9 @@ get_substring_vrFilter(
                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, DETAIL1, 
+                               "get_substring_filter: conn %d  INITIAL\n", 
+                               conn->c_connid, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_FILTER, "  INITIAL\n", 0, 0, 0 );
 #endif
@@ -1451,9 +1462,8 @@ get_substring_vrFilter(
 
                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, DETAIL1, 
+                               "get_substring_filter: conn %d  ANY\n", conn->c_connid, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_FILTER, "  ANY\n", 0, 0, 0 );
 #endif
@@ -1468,9 +1478,8 @@ get_substring_vrFilter(
 
                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, DETAIL1, 
+                               "get_substring_filter: conn %d  FINAL\n", conn->c_connid, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_FILTER, "  FINAL\n", 0, 0, 0 );
 #endif
@@ -1485,9 +1494,9 @@ get_substring_vrFilter(
 
                default:
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
+                       LDAP_LOG( FILTER, INFO, 
                                "get_substring_filter: conn %d  unknown substring type %ld\n",
-                               conn->c_connid, (long)tag ));
+                               conn->c_connid, (long)tag, 0 );
 #else
                        Debug( LDAP_DEBUG_FILTER,
                                "  unknown substring type=%ld\n",
@@ -1498,9 +1507,9 @@ get_substring_vrFilter(
 
 return_error:
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
+                       LDAP_LOG( FILTER, INFO, 
                                "get_substring_filter: conn %d  error %ld\n",
-                               conn->c_connid, (long)rc ));
+                               conn->c_connid, (long)rc, 0 );
 #else
                        Debug( LDAP_DEBUG_FILTER, "  error=%ld\n",
                                (long) rc, 0, 0 );
@@ -1514,8 +1523,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, ENTRY, 
+               "get_substring_filter: conn %d exit\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 );
 #endif