Reverse last commit. Wrong tree.

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

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index eb70948b443f353c8d0a94ed78c1fddb2269bd8d..cdb9c581ee8347882b4f72433de59311fe65750e 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2006 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -153,7 +153,7 @@ ldap_back_search(
        int             i;
        char            **attrs = NULL;
        int             freetext = 0;
-       int             do_retry = 1;
+       int             do_retry = 1, dont_retry = 0;
        LDAPControl     **ctrls = NULL;
        /* FIXME: shouldn't this be null? */
        const char      *save_matched = rs->sr_matched;
@@ -209,7 +209,7 @@ ldap_back_search(
        /* deal with <draft-zeilenga-ldap-t-f> filters */
        filter = op->ors_filterstr;
 retry:
-       rs->sr_err = ldap_search_ext( lc->lc_ld, op->o_req_ndn.bv_val,
+       rs->sr_err = ldap_search_ext( lc->lc_ld, op->o_req_dn.bv_val,
                        op->ors_scope, filter.bv_val,
                        attrs, op->ors_attrsonly, ctrls, NULL,
                        tv.tv_sec ? &tv : NULL,
@@ -258,7 +258,7 @@ retry:
         * but this is necessary for version matching, and for ACL processing.
         */
 
-       for ( rc = 0; rc != -1; rc = ldap_result( lc->lc_ld, msgid, 0, &tv, &res ) )
+       for ( rc = 0; rc != -1; rc = ldap_result( lc->lc_ld, msgid, LDAP_MSG_ONE, &tv, &res ) )
        {
                /* check for abandon */
                if ( op->o_abandon ) {
@@ -282,11 +282,17 @@ retry:
                                rc = rs->sr_err = LDAP_TIMELIMIT_EXCEEDED;
                                goto finish;
                        }
+                       continue;
 
-               } else if ( rc == LDAP_RES_SEARCH_ENTRY ) {
+               } else {
+                       /* don't retry any more */
+                       dont_retry = 1;
+               }
+
+
+               if ( rc == LDAP_RES_SEARCH_ENTRY ) {
                        Entry           ent = { 0 };
                        struct berval   bdn = BER_BVNULL;
-                       int             abort = 0;
 
                        do_retry = 0;
 
@@ -297,24 +303,26 @@ retry:
                                rs->sr_attrs = op->ors_attrs;
                                rs->sr_operational_attrs = NULL;
                                rs->sr_flags = 0;
-                               abort = send_search_entry( op, rs );
+                               rs->sr_err = LDAP_SUCCESS;
+                               rc = rs->sr_err = send_search_entry( op, rs );
                                if ( !BER_BVISNULL( &ent.e_name ) ) {
                                        assert( ent.e_name.bv_val != bdn.bv_val );
-                                       free( ent.e_name.bv_val );
+                                       op->o_tmpfree( ent.e_name.bv_val, op->o_tmpmemctx );
                                        BER_BVZERO( &ent.e_name );
                                }
                                if ( !BER_BVISNULL( &ent.e_nname ) ) {
-                                       free( ent.e_nname.bv_val );
+                                       op->o_tmpfree( ent.e_nname.bv_val, op->o_tmpmemctx );
                                        BER_BVZERO( &ent.e_nname );
                                }
                                entry_clean( &ent );
                        }
                        ldap_msgfree( res );
-                       if ( abort ) {
-                               if ( abort == SLAPD_SEND_SIZELIMIT ) {
-                                       rc = rs->sr_err = LDAP_SIZELIMIT_EXCEEDED;
+                       if ( rc != LDAP_SUCCESS ) {
+                               if ( rc == LDAP_UNAVAILABLE ) {
+                                       rc = rs->sr_err = LDAP_OTHER;
+                               } else {
+                                       ldap_abandon_ext( lc->lc_ld, msgid, NULL, NULL );
                                }
-                               ldap_abandon_ext( lc->lc_ld, msgid, NULL, NULL );
                                goto finish;
                        }
 
@@ -405,22 +413,10 @@ retry:
                        }
 
                        if ( match.bv_val != NULL ) {
-#ifndef LDAP_NULL_IS_NULL
-                               if ( match.bv_val[ 0 ] == '\0' ) {
-                                       LDAP_FREE( match.bv_val );
-                                       BER_BVZERO( &match );
-                               } else
-#endif /* LDAP_NULL_IS_NULL */
                                {
                                        match.bv_len = strlen( match.bv_val );
                                }
                        }
-#ifndef LDAP_NULL_IS_NULL
-                       if ( rs->sr_text != NULL && rs->sr_text[ 0 ] == '\0' ) {
-                               LDAP_FREE( (char *)rs->sr_text );
-                               rs->sr_text = NULL;
-                       }
-#endif /* LDAP_NULL_IS_NULL */
 
                        /* cleanup */
                        if ( references ) {
@@ -432,10 +428,10 @@ retry:
                }
        }
 
-       if ( rc == -1 ) {
+       if ( rc == -1 && dont_retry == 0 ) {
                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_DONTSEND ) ) {
                                goto retry;
                        }
                }
@@ -713,12 +709,14 @@ ldap_back_entry_get(
        struct berval   bdn;
        LDAPMessage     *result = NULL,
                        *e = NULL;
-       char            *gattr[3];
+       char            *attr[3], **attrp = NULL;
        char            *filter = NULL;
        SlapReply       rs;
        int             do_retry = 1;
        LDAPControl     **ctrls = NULL;
 
+       *ent = NULL;
+
        /* Tell getconn this is a privileged op */
        do_not_cache = op->o_do_not_cache;
        op->o_do_not_cache = 1;
@@ -730,14 +728,15 @@ ldap_back_entry_get(
        op->o_do_not_cache = do_not_cache;
 
        if ( at ) {
+               attrp = attr;
                if ( oc && at != slap_schema.si_ad_objectClass ) {
-                       gattr[0] = slap_schema.si_ad_objectClass->ad_cname.bv_val;
-                       gattr[1] = at->ad_cname.bv_val;
-                       gattr[2] = NULL;
+                       attr[0] = slap_schema.si_ad_objectClass->ad_cname.bv_val;
+                       attr[1] = at->ad_cname.bv_val;
+                       attr[2] = NULL;
 
                } else {
-                       gattr[0] = at->ad_cname.bv_val;
-                       gattr[1] = NULL;
+                       attr[0] = at->ad_cname.bv_val;
+                       attr[1] = NULL;
                }
        }
 
@@ -760,8 +759,8 @@ ldap_back_entry_get(
        
 retry:
        rc = ldap_search_ext_s( lc->lc_ld, ndn->bv_val, LDAP_SCOPE_BASE, filter,
-                               at ? gattr : NULL, 0, ctrls, NULL,
-                               LDAP_NO_LIMIT, LDAP_NO_LIMIT, &result );
+                               attrp, 0, ctrls, NULL,
+                               NULL, LDAP_NO_LIMIT, &result );
        if ( rc != LDAP_SUCCESS ) {
                if ( rc == LDAP_SERVER_DOWN && do_retry ) {
                        do_retry = 0;
@@ -774,10 +773,15 @@ retry:
 
        e = ldap_first_entry( lc->lc_ld, result );
        if ( e == NULL ) {
+               /* the entry exists, but it doesn't match the filter? */
                goto cleanup;
        }
 
        *ent = ch_calloc( 1, sizeof( Entry ) );
+       if ( *ent == NULL ) {
+               rc = LDAP_NO_MEMORY;
+               goto cleanup;
+       }
 
        rc = ldap_build_entry( op, e, *ent, &bdn );