r23795: more v2->v3 conversion

[samba.git] / source4 / lib / ldb / modules / paged_results.c

diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c
index 2d972b73164dad3f94f4130758047a63d295f96b..7df853e40483581b92e60329f8b9d7067970acbd 100644 (file)
--- a/source4/lib/ldb/modules/paged_results.c
+++ b/source4/lib/ldb/modules/paged_results.c
@@ -10,7 +10,7 @@
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   version 3 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,8 +33,7 @@
  *  Author: Simo Sorce
  */
 
-#include "includes.h"
-#include "ldb/include/includes.h"
+#include "ldb_includes.h"
 
 struct message_store {
        /* keep the whole ldb_reply as an optimization
@@ -44,11 +43,15 @@ struct message_store {
        struct message_store *next;
 };
 
+struct private_data;
+
 struct results_store {
+
+       struct private_data *priv;
+
        char *cookie;
        time_t timestamp;
-       int num_sent; /* To be removed */
-       struct ldb_result *result; /* To be removed */
+
        struct results_store *prev;
        struct results_store *next;
        
@@ -79,47 +82,50 @@ int store_destructor(struct results_store *store)
        if (store->next) {
                store->next->prev = store->prev;
        }
-       
+
+       if (store == store->priv->store) {
+               store->priv->store = NULL;
+       }
+
        return 0;
 }
 
 static struct results_store *new_store(struct private_data *priv)
 {
-       struct results_store *new;
+       struct results_store *newr;
        int new_id = priv->next_free_id++;
 
        /* TODO: we should have a limit on the number of
         * outstanding paged searches
         */
 
-       new = talloc(priv, struct results_store);
-       if (!new) return NULL;
+       newr = talloc(priv, struct results_store);
+       if (!newr) return NULL;
+
+       newr->priv = priv;
 
-       new->cookie = talloc_asprintf(new, "%d", new_id);
-       if (!new->cookie) {
-               talloc_free(new);
+       newr->cookie = talloc_asprintf(newr, "%d", new_id);
+       if (!newr->cookie) {
+               talloc_free(newr);
                return NULL;
        }
 
-       new->timestamp = time(NULL);
+       newr->timestamp = time(NULL);
 
-       new->num_sent = 0; /* To be removed */
-       new->result = NULL; /* To be removed */
-
-       new->first = NULL;
-       new->num_entries = 0;
-       new->first_ref = NULL;
-       new->controls = NULL;
+       newr->first = NULL;
+       newr->num_entries = 0;
+       newr->first_ref = NULL;
+       newr->controls = NULL;
 
        /* put this entry as first */
-       new->prev = NULL;
-       new->next = priv->store;
-       if (priv->store != NULL) priv->store->prev = new;
-       priv->store = new;
+       newr->prev = NULL;
+       newr->next = priv->store;
+       if (priv->store != NULL) priv->store->prev = newr;
+       priv->store = newr;
 
-       talloc_set_destructor(new, store_destructor);
+       talloc_set_destructor(newr, store_destructor);
 
-       return new;
+       return newr;
 }
 
 struct paged_context {
@@ -141,7 +147,7 @@ static struct ldb_handle *init_handle(void *mem_ctx, struct ldb_module *module,
 
        h = talloc_zero(mem_ctx, struct ldb_handle);
        if (h == NULL) {
-               ldb_set_errstring(module->ldb, talloc_asprintf(module, "Out of Memory"));
+               ldb_set_errstring(module->ldb, "Out of Memory");
                return NULL;
        }
 
@@ -149,7 +155,7 @@ static struct ldb_handle *init_handle(void *mem_ctx, struct ldb_module *module,
 
        ac = talloc_zero(h, struct paged_context);
        if (ac == NULL) {
-               ldb_set_errstring(module->ldb, talloc_asprintf(module, "Out of Memory"));
+               ldb_set_errstring(module->ldb, "Out of Memory");
                talloc_free(h);
                return NULL;
        }
@@ -171,7 +177,7 @@ static int paged_search_callback(struct ldb_context *ldb, void *context, struct
        struct paged_context *ac = NULL;
 
        if (!context || !ares) {
-               ldb_set_errstring(ldb, talloc_asprintf(ldb, "NULL Context or Result in callback"));
+               ldb_set_errstring(ldb, "NULL Context or Result in callback");
                goto error;
        }
 
@@ -191,9 +197,6 @@ static int paged_search_callback(struct ldb_context *ldb, void *context, struct
                ac->store->num_entries++;
 
                ac->store->last->r = talloc_steal(ac->store->last, ares);
-               if (ac->store->last->r == NULL) {
-                       goto error;
-               }
                ac->store->last->next = NULL;
        }
 
@@ -209,19 +212,11 @@ static int paged_search_callback(struct ldb_context *ldb, void *context, struct
                }
 
                ac->store->last_ref->r = talloc_steal(ac->store->last, ares);
-               if (ac->store->last_ref->r == NULL) {
-                       goto error;
-               }
                ac->store->last_ref->next = NULL;
        }
 
        if (ares->type == LDB_REPLY_DONE) {
-               if (ares->controls) {
-                       ac->store->controls = talloc_steal(ac->store, ares->controls);
-                       if (! ac->store->controls) {
-                               goto error;
-                       }
-               }
+               ac->store->controls = talloc_move(ac->store, &ares->controls);
                talloc_free(ares);
        }
 
@@ -243,7 +238,7 @@ static int paged_search(struct ldb_module *module, struct ldb_request *req)
        int ret;
 
        /* check if there's a paged request control */
-       control = get_control_from_list(req->controls, LDB_CONTROL_PAGED_RESULTS_OID);
+       control = ldb_request_get_control(req, LDB_CONTROL_PAGED_RESULTS_OID);
        if (control == NULL) {
                /* not found go on */
                return ldb_next_request(module, req);
@@ -254,8 +249,8 @@ static int paged_search(struct ldb_module *module, struct ldb_request *req)
        req->handle = NULL;
 
        if (!req->callback || !req->context) {
-               ldb_set_errstring(module->ldb, talloc_asprintf(module,
-                                 "Async interface called with NULL callback function or NULL context"));
+               ldb_set_errstring(module->ldb,
+                                 "Async interface called with NULL callback function or NULL context");
                return LDB_ERR_OPERATIONS_ERROR;
        }
        
@@ -394,7 +389,7 @@ static int paged_results(struct ldb_handle *handle)
                ares->controls = ac->store->controls;
                while (ares->controls[i]) i++; /* counting */
 
-               ares->controls = talloc_steal(ares, ac->store->controls);
+               ares->controls = talloc_move(ares, &ac->store->controls);
                num_ctrls += i;
        }
 
@@ -548,9 +543,7 @@ static int paged_request_init(struct ldb_module *module)
 
        ret = ldb_request(module->ldb, req);
        if (ret != LDB_SUCCESS) {
-               ldb_debug(module->ldb, LDB_DEBUG_ERROR, "paged_request: Unable to register control with rootdse!\n");
-               talloc_free(req);
-               return LDB_ERR_OTHER;
+               ldb_debug(module->ldb, LDB_DEBUG_WARNING, "paged_request: Unable to register control with rootdse!\n");
        }
 
        talloc_free(req);