ITS#5860 - more for entry cache counts

[openldap] / servers / slapd / back-ldap / search.c

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index f797474a523532009d448c4e178431393c283b8e..b3a68b31411e21f23fe4793354cf1e228e3138b6 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -47,7 +47,8 @@ ldap_build_entry( Operation *op, LDAPMessage *e, Entry *ent,
 static int
 ldap_back_munge_filter(
        Operation       *op,
-       struct berval   *filter )
+       struct berval   *filter,
+       int     *freeit )
 {
        ldapinfo_t      *li = (ldapinfo_t *) op->o_bd->be_private;
 
@@ -122,6 +123,7 @@ ldap_back_munge_filter(
                        AC_MEMCPY( filter->bv_val, op->ors_filterstr.bv_val,
                                        op->ors_filterstr.bv_len + 1 );
 
+                       *freeit = 1;
                } else {
                        filter->bv_val = op->o_tmprealloc( filter->bv_val,
                                        filter->bv_len + 1, op->o_tmpmemctx );
@@ -163,7 +165,7 @@ ldap_back_search(
                        filter = BER_BVNULL;
        int             i;
        char            **attrs = NULL;
-       int             freetext = 0;
+       int             freetext = 0, freefilter = 0;
        int             do_retry = 1, dont_retry = 0;
        LDAPControl     **ctrls = NULL;
        char            **references = NULL;
@@ -242,7 +244,7 @@ retry:
                        goto finish;
 
                case LDAP_FILTER_ERROR:
-                       if (ldap_back_munge_filter( op, &filter ) > 0 ) {
+                       if (ldap_back_munge_filter( op, &filter, &freefilter ) > 0 ) {
                                goto retry;
                        }
 
@@ -424,10 +426,34 @@ retry:
                        }
 
                } else if ( rc == LDAP_RES_INTERMEDIATE ) {
-                       Debug( LDAP_DEBUG_ANY,
-                               "%s ldap_back_search: "
-                               "intermediate response not supported yet.\n",
-                               op->o_log_prefix, 0, 0 );
+                       /* FIXME: response controls
+                        * are passed without checks */
+                       rc = ldap_parse_intermediate( lc->lc_ld,
+                               res,
+                               (char **)&rs->sr_rspoid,
+                               &rs->sr_rspdata,
+                               &rs->sr_ctrls,
+                               0 );
+                       if ( rc != LDAP_SUCCESS ) {
+                               continue;
+                       }
+
+                       slap_send_ldap_intermediate( op, rs );
+
+                       if ( rs->sr_rspoid != NULL ) {
+                               ber_memfree( (char *)rs->sr_rspoid );
+                               rs->sr_rspoid = NULL;
+                       }
+
+                       if ( rs->sr_rspdata != NULL ) {
+                               ber_bvfree( rs->sr_rspdata );
+                               rs->sr_rspdata = NULL;
+                       }
+
+                       if ( rs->sr_ctrls != NULL ) {
+                               ldap_controls_free( rs->sr_ctrls );
+                               rs->sr_ctrls = NULL;
+                       }
 
                } else {
                        char            *err = NULL;
@@ -537,7 +563,7 @@ finish:;
                ldap_back_quarantine( op, rs );
        }
 
-       if ( filter.bv_val != op->ors_filterstr.bv_val ) {
+       if ( freefilter && filter.bv_val != op->ors_filterstr.bv_val ) {
                op->o_tmpfree( filter.bv_val, op->o_tmpmemctx );
        }
 
@@ -705,7 +731,14 @@ ldap_build_entry(
                        goto next_attr;
                }
 
-               for ( i = 0; !BER_BVISNULL( &attr->a_vals[i] ); i++ ) {
+               for ( i = 0; !BER_BVISNULL( &attr->a_vals[i] ); i++ ) ;
+               last = i;
+
+               /*
+                * check that each value is valid per syntax
+                * and pretty if appropriate
+                */
+               for ( i = 0; i<last; i++ ) {
                        struct berval   pval;
                        int             rc;
 
@@ -728,18 +761,27 @@ ldap_build_entry(
                                        ber_dupbv( &pval, &oc->soc_cname );
 
                                } else {
-                                       attr->a_nvals = NULL;
-                                       attr_free( attr );
-                                       goto next_attr;
+                                       LBER_FREE( attr->a_vals[i].bv_val );
+                                       if ( --last == i ) {
+                                               BER_BVZERO( &attr->a_vals[i] );
+                                               break;
+                                       }
+                                       attr->a_vals[i] = attr->a_vals[last];
+                                       BER_BVZERO( &attr->a_vals[last] );
+                                       i--;
                                }
-                       }
 
-                       if ( pretty ) {
+                       } else if ( pretty ) {
                                LBER_FREE( attr->a_vals[i].bv_val );
                                attr->a_vals[i] = pval;
                        }
                }
                attr->a_numvals = last = i;
+               if ( last == 0 && attr->a_vals != &slap_dummy_bv ) {
+                       attr->a_nvals = NULL;
+                       attr_free( attr );
+                       goto next_attr;
+               }
 
                if ( last && attr->a_desc->ad_type->sat_equality &&
                                attr->a_desc->ad_type->sat_equality->smr_normalize )
@@ -748,10 +790,6 @@ ldap_build_entry(
                        for ( i = 0; i < last; i++ ) {
                                int             rc;
 
-                               /*
-                                * check that each value is valid per syntax
-                                * and pretty if appropriate
-                                */
                                rc = attr->a_desc->ad_type->sat_equality->smr_normalize(
                                        SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
                                        attr->a_desc->ad_type->sat_syntax,
@@ -760,16 +798,52 @@ ldap_build_entry(
                                        NULL );
 
                                if ( rc != LDAP_SUCCESS ) {
-                                       BER_BVZERO( &attr->a_nvals[i] );
-                                       attr_free( attr );
-                                       goto next_attr;
+                                       LBER_FREE( attr->a_vals[i].bv_val );
+                                       if ( --last == i ) {
+                                               BER_BVZERO( &attr->a_vals[i] );
+                                               break;
+                                       }
+                                       attr->a_vals[i] = attr->a_vals[last];
+                                       BER_BVZERO( &attr->a_vals[last] );
+                                       i--;
                                }
                        }
                        BER_BVZERO( &attr->a_nvals[i] );
+                       if ( last == 0 ) {
+                               attr_free( attr );
+                               goto next_attr;
+                       }
 
                } else {
                        attr->a_nvals = attr->a_vals;
                }
+
+               attr->a_numvals = last;
+
+               /* Handle sorted vals, strip dups but keep the attr */
+               if ( attr->a_desc->ad_type->sat_flags & SLAP_AT_SORTED_VAL ) {
+                       while ( attr->a_numvals > 1 ) {
+                               int rc = slap_sort_vals( (Modifications *)attr, &text, &i, op->o_tmpmemctx );
+                               if ( rc != LDAP_TYPE_OR_VALUE_EXISTS )
+                                       break;
+
+                               /* Strip duplicate values */
+                               if ( attr->a_nvals != attr->a_vals )
+                                       LBER_FREE( attr->a_nvals[i].bv_val );
+                               LBER_FREE( attr->a_vals[i].bv_val );
+                               attr->a_numvals--;
+                               if ( i < attr->a_numvals ) {
+                                       attr->a_vals[i] = attr->a_vals[attr->a_numvals];
+                                       if ( attr->a_nvals != attr->a_vals )
+                                               attr->a_nvals[i] = attr->a_nvals[attr->a_numvals];
+                               }
+                               BER_BVZERO(&attr->a_vals[attr->a_numvals]);
+                               if ( attr->a_nvals != attr->a_vals )
+                                       BER_BVZERO(&attr->a_nvals[attr->a_numvals]);
+                       }
+                       attr->a_flags |= SLAP_ATTR_SORTED_VALS;
+               }
+
                *attrp = attr;
                attrp = &attr->a_next;