Code clean-up.

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

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 5b193271042855a9d9d73798430d00e788a3e7ce..a754e21e2a9d9d1ab167dcd7b1e9839a978a20da 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -11,9 +11,9 @@
 #include "back-ldbm.h"
 #include "proto-back-ldbm.h"
 
-static IDList  *base_candidates(Backend *be, Connection *conn, Operation *op, char *base, Filter *filter, char **attrs, int attrsonly, char **matched, int *err);
-static IDList  *onelevel_candidates(Backend *be, Connection *conn, Operation *op, char *base, Filter *filter, char **attrs, int attrsonly, char **matched, int *err);
-static IDList  *subtree_candidates(Backend *be, Connection *conn, Operation *op, char *base, Filter *filter, char **attrs, int attrsonly, char **matched, Entry *e, int *err, int lookupbase);
+static ID_BLOCK        *base_candidates(Backend *be, Connection *conn, Operation *op, char *base, Filter *filter, char **attrs, int attrsonly, char **matched, int *err);
+static ID_BLOCK        *onelevel_candidates(Backend *be, Connection *conn, Operation *op, char *base, Filter *filter, char **attrs, int attrsonly, char **matched, int *err);
+static ID_BLOCK        *subtree_candidates(Backend *be, Connection *conn, Operation *op, char *base, Filter *filter, char **attrs, int attrsonly, char **matched, Entry *e, int *err, int lookupbase);
 
 #define GRABSIZE       BUFSIZ
 
@@ -45,7 +45,7 @@ ldbm_back_search(
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
        int             err;
        time_t          stoptime;
-       IDList          *candidates;
+       ID_BLOCK                *candidates;
        ID              id;
        Entry           *e;
        Attribute       *ref;
@@ -171,7 +171,7 @@ ldbm_back_search(
 
                /* get the entry with reader lock */
                if ( (e = id2entry_r( be, id )) == NULL ) {
-                       Debug( LDAP_DEBUG_ARGS, "candidate %lu not found\n",
+                       Debug( LDAP_DEBUG_ARGS, "candidate %ld not found\n",
                               id, 0, 0 );
                        continue;
                }
@@ -254,28 +254,35 @@ ldbm_back_search(
                                        case LDAP_DEREF_ALWAYS:
                                                {
                                                        Entry *newe = derefAlias_r( be, conn, op, e );
-                                                       cache_return_entry_r( &li->li_cache, e );
-                                                       e = newe;
+                                                       if ( newe == NULL ) { /* problem with the alias */
+                                                               cache_return_entry_r( &li->li_cache, e );
+                                                               e = NULL;
+                                                       }
+                                                       else if ( newe != e ) { /* reassign e */
+                                                               cache_return_entry_r( &li->li_cache, e );
+                                                               e = newe;
+                                                       }       
                                                }
                                                break;
                                        }
+                                       if (e) {
+                                               switch ( send_search_entry( be, conn, op, e,
+                                                       attrs, attrsonly ) ) {
+                                               case 0:         /* entry sent ok */
+                                                       nentries++;
+                                                       break;
+                                               case 1:         /* entry not sent */
+                                                       break;
+                                               case -1:        /* connection closed */
+                                                       cache_return_entry_r( &li->li_cache, e );
+                                                       idl_free( candidates );
+                                                       free( rbuf );
 
-                                       switch ( send_search_entry( be, conn, op, e,
-                                               attrs, attrsonly ) ) {
-                                       case 0:         /* entry sent ok */
-                                               nentries++;
-                                               break;
-                                       case 1:         /* entry not sent */
-                                               break;
-                                       case -1:        /* connection closed */
-                                               cache_return_entry_r( &li->li_cache, e );
-                                               idl_free( candidates );
-                                               free( rbuf );
-
-                                               if( realBase != NULL) {
-                                                       free( realBase );
+                                                       if( realBase != NULL) {
+                                                               free( realBase );
+                                                       }
+                                                       return( 0 );
                                                }
-                                               return( 0 );
                                        }
                                }
                        }
@@ -305,7 +312,7 @@ ldbm_back_search(
        return( 0 );
 }
 
-static IDList *
+static ID_BLOCK *
 base_candidates(
     Backend    *be,
     Connection *conn,
@@ -321,7 +328,7 @@ base_candidates(
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
        int             rc;
        ID              id;
-       IDList          *idl;
+       ID_BLOCK                *idl;
        Entry           *e;
 
        Debug(LDAP_DEBUG_TRACE, "base_candidates: base: \"%s\"\n", base, 0, 0);
@@ -346,7 +353,7 @@ base_candidates(
        return( idl );
 }
 
-static IDList *
+static ID_BLOCK *
 onelevel_candidates(
     Backend    *be,
     Connection *conn,
@@ -363,7 +370,7 @@ onelevel_candidates(
        Entry           *e = NULL;
        Filter          *f;
        char            buf[20];
-       IDList          *candidates;
+       ID_BLOCK                *candidates;
 
        Debug(LDAP_DEBUG_TRACE, "onelevel_candidates: base: \"%s\"\n", base, 0, 0);
 
@@ -409,7 +416,7 @@ onelevel_candidates(
        return( candidates );
 }
 
-static IDList *
+static ID_BLOCK *
 subtree_candidates(
     Backend    *be,
     Connection *conn,
@@ -426,7 +433,7 @@ subtree_candidates(
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
        Filter          *f, **filterarg_ptr;
-       IDList          *candidates;
+       ID_BLOCK                *candidates;
 
        Debug(LDAP_DEBUG_TRACE, "subtree_candidates: base: \"%s\" %s\n",
                base ? base : "NULL", lookupbase ? "lookupbase" : "", 0);