plug one-time leaks

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

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index b38b3db93571b9746f81e6f355597dbb93e4043e..8ddd2155c41862a57e5043707584c5e0ecb3d1c2 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -49,7 +49,7 @@ ldap_back_munge_filter(
        Operation       *op,
        struct berval   *filter )
 {
-       struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
+       ldapinfo_t      *li = (ldapinfo_t *) op->o_bd->be_private;
 
        char            *ptr;
        int             gotit = 0;
@@ -75,7 +75,7 @@ ldap_back_munge_filter(
 
                if ( strncmp( ptr, bv_true.bv_val, bv_true.bv_len ) == 0 ) {
                        oldbv = &bv_true;
-                       if ( li->flags & LDAP_BACK_F_SUPPORT_T_F ) {
+                       if ( li->li_flags & LDAP_BACK_F_SUPPORT_T_F ) {
                                newbv = &bv_t;
 
                        } else {
@@ -85,7 +85,7 @@ ldap_back_munge_filter(
                } else if ( strncmp( ptr, bv_false.bv_val, bv_false.bv_len ) == 0 )
                {
                        oldbv = &bv_false;
-                       if ( li->flags & LDAP_BACK_F_SUPPORT_T_F ) {
+                       if ( li->li_flags & LDAP_BACK_F_SUPPORT_T_F ) {
                                newbv = &bv_f;
 
                        } else {
@@ -141,9 +141,9 @@ ldap_back_search(
                Operation       *op,
                SlapReply       *rs )
 {
-       struct ldapconn *lc;
+       ldapconn_t      *lc;
        struct timeval  tv;
-       time_t          stoptime;
+       time_t          stoptime = (time_t)-1;
        LDAPMessage     *res,
                        *e;
        int             rc = 0,
@@ -155,6 +155,8 @@ ldap_back_search(
        int             freetext = 0;
        int             do_retry = 1;
        LDAPControl     **ctrls = NULL;
+       /* FIXME: shouldn't this be null? */
+       const char      *save_matched = rs->sr_matched;
 
        lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
        if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
@@ -178,8 +180,7 @@ ldap_back_search(
                stoptime = op->o_time + op->ors_tlimit;
 
        } else {
-               tv.tv_sec = 0;
-               tv.tv_usec = 100000;
+               LDAP_BACK_TV_SET( &tv );
        }
 
        if ( op->ors_attrs ) {
@@ -220,13 +221,20 @@ fail:;
                case LDAP_SERVER_DOWN:
                        if ( do_retry ) {
                                do_retry = 0;
-                               if ( ldap_back_retry( lc, op, rs, LDAP_BACK_DONTSEND ) ) {
+                               if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_DONTSEND ) ) {
                                        goto retry;
                                }
                        }
-                       rc = ldap_back_op_result( lc, op, rs, msgid, LDAP_BACK_DONTSEND );
-                       ldap_back_freeconn( op, lc );
-                       lc = NULL;
+                       if ( lc == NULL ) {
+                               /* reset by ldap_back_retry ... */
+                               rs->sr_err = slap_map_api2result( rs );
+
+                       } else {
+                               rc = ldap_back_op_result( lc, op, rs, msgid, 0, LDAP_BACK_DONTSEND );
+                               ldap_back_freeconn( op, lc, 0 );
+                               lc = NULL;
+                       }
+                               
                        goto finish;
 
                case LDAP_FILTER_ERROR:
@@ -264,8 +272,7 @@ fail:;
                }
 
                if ( rc == 0 ) {
-                       tv.tv_sec = 0;
-                       tv.tv_usec = 100000;
+                       LDAP_BACK_TV_SET( &tv );
                        ldap_pvt_thread_yield();
 
                        /* check time limit */
@@ -348,7 +355,7 @@ fail:;
 
                        /* cleanup */
                        if ( references ) {
-                               ldap_value_free( references );
+                               ber_memvfree( (void **)references );
                                ch_free( rs->sr_ref );
                                rs->sr_ref = NULL;
                        }
@@ -406,7 +413,7 @@ fail:;
 
                        /* cleanup */
                        if ( references ) {
-                               ldap_value_free( references );
+                               ber_memvfree( (void **)references );
                        }
 
                        rc = 0;
@@ -417,19 +424,28 @@ fail:;
        if ( rc == -1 ) {
                if ( do_retry ) {
                        do_retry = 0;
-                       if ( ldap_back_retry( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+                       if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
                                goto retry;
                        }
                }
                rs->sr_err = LDAP_SERVER_DOWN;
-               goto fail;
+               rs->sr_err = slap_map_api2result( rs );
+               goto finish;
        }
 
        /*
         * Rewrite the matched portion of the search base, if required
         */
        if ( !BER_BVISNULL( &match ) && !BER_BVISEMPTY( &match ) ) {
-               rs->sr_matched = match.bv_val;
+               struct berval   pmatch;
+
+               if ( dnPretty( NULL, &match, &pmatch, op->o_tmpmemctx ) == LDAP_SUCCESS ) {
+                       rs->sr_matched = pmatch.bv_val;
+                       LDAP_FREE( match.bv_val );
+
+               } else {
+                       rs->sr_matched = match.bv_val;
+               }
        }
 
        if ( rs->sr_v2ref ) {
@@ -448,9 +464,14 @@ finish:;
                rs->sr_ctrls = NULL;
        }
 
-       if ( match.bv_val ) {
-               rs->sr_matched = NULL;
-               LDAP_FREE( match.bv_val );
+       if ( rs->sr_matched != NULL && rs->sr_matched != save_matched ) {
+               if ( rs->sr_matched != match.bv_val ) {
+                       ber_memfree_x( (char *)rs->sr_matched, op->o_tmpmemctx );
+
+               } else {
+                       LDAP_FREE( match.bv_val );
+               }
+               rs->sr_matched = save_matched;
        }
 
        if ( !BER_BVISNULL( &filter ) && filter.bv_val != op->ors_filterstr.bv_val ) {
@@ -477,7 +498,7 @@ finish:;
                ldap_back_release_conn( op, rs, lc );
        }
 
-       return rc;
+       return rs->sr_err;
 }
 
 static int
@@ -675,7 +696,7 @@ ldap_back_entry_get(
                Entry                   **ent
 )
 {
-       struct ldapconn *lc;
+       ldapconn_t      *lc;
        int             rc = 1,
                        do_not_cache;
        struct berval   bdn;
@@ -733,7 +754,7 @@ retry:
        if ( rc != LDAP_SUCCESS ) {
                if ( rc == LDAP_SERVER_DOWN && do_retry ) {
                        do_retry = 0;
-                       if ( ldap_back_retry( lc, op, &rs, LDAP_BACK_DONTSEND ) ) {
+                       if ( ldap_back_retry( &lc, op, &rs, LDAP_BACK_DONTSEND ) ) {
                                goto retry;
                        }
                }