Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
[kai/samba.git] / source / lib / ldb / common / ldb.c
index 1022f422c07dabaa06df5b80145f69d8d3ec5cdb..3c9ef3ff6939f8095952e48766318be9bb52500c 100644 (file)
@@ -11,7 +11,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
@@ -19,8 +19,7 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
@@ -33,8 +32,7 @@
  *  Author: Andrew Tridgell
  */
 
-#include "includes.h"
-#include "ldb/include/includes.h"
+#include "ldb_includes.h"
 
 /* 
    initialise a ldb context
@@ -52,44 +50,85 @@ struct ldb_context *ldb_init(void *mem_ctx)
        }
 
        ldb_set_utf8_default(ldb);
+       ldb_set_create_perms(ldb, 0666);
+       ldb_set_modules_dir(ldb, LDB_MODULESDIR);
 
        return ldb;
 }
 
-static struct ldb_backend {
-       const char *name;
-       ldb_connect_fn connect_fn;
-       struct ldb_backend *prev, *next;
+static struct backends_list_entry {
+       struct ldb_backend_ops *ops;
+       struct backends_list_entry *prev, *next;
 } *ldb_backends = NULL;
+
+#ifndef STATIC_LIBLDB_BACKENDS 
+
+#ifdef HAVE_LDB_LDAP
+#define LDAP_INIT &ldb_ldap_backend_ops, \
+                                 &ldb_ildap_backend_ops, \
+                                 &ldb_ldaps_backend_ops,
+#else
+#define LDAP_INIT
+#endif
+
+#ifdef HAVE_LDB_SQLITE3
+#define SQLITE3_INIT &ldb_sqlite3_backend_ops,
+#else
+#define SQLITE3_INIT
+#endif
+
+#define STATIC_LIBLDB_BACKENDS \
+       LDAP_INIT \
+       SQLITE3_INIT \
+       &ldb_tdb_backend_ops,   \
+       NULL
+#endif
+
+const static struct ldb_backend_ops *builtin_backends[] = {
+       STATIC_LIBLDB_BACKENDS
+};
+
+static ldb_connect_fn ldb_find_backend(const char *url)
+{
+       struct backends_list_entry *backend;
+       int i;
+
+       for (i = 0; builtin_backends[i]; i++) {
+               if (strncmp(builtin_backends[i]->name, url, strlen(builtin_backends[i]->name)) == 0)
+                       return builtin_backends[i]->connect_fn;
+       }
+
+       for (backend = ldb_backends; backend; backend = backend->next) {
+               if (strncmp(backend->ops->name, url, strlen(backend->ops->name)) == 0) {
+                       return backend->ops->connect_fn;
+               }
+       }
+
+       return NULL;
+}
+
 /*
  register a new ldb backend
 */
 int ldb_register_backend(const char *url_prefix, ldb_connect_fn connectfn)
 {
-       struct ldb_backend *backend = talloc(talloc_autofree_context(), struct ldb_backend);
+       struct ldb_backend_ops *backend = talloc(talloc_autofree_context(), struct ldb_backend_ops);
+       struct backends_list_entry *entry = talloc(talloc_autofree_context(), struct backends_list_entry);
+
+       if (ldb_find_backend(url_prefix)) {
+               return LDB_SUCCESS;
+       }
 
        /* Maybe check for duplicity here later on? */
 
        backend->name = talloc_strdup(backend, url_prefix);
        backend->connect_fn = connectfn;
-       DLIST_ADD(ldb_backends, backend);
+       entry->ops = backend;
+       DLIST_ADD(ldb_backends, entry);
 
        return LDB_SUCCESS;
 }
 
-static ldb_connect_fn ldb_find_backend(const char *url)
-{
-       struct ldb_backend *backend;
-
-       for (backend = ldb_backends; backend; backend = backend->next) {
-               if (strncmp(backend->name, url, strlen(backend->name)) == 0) {
-                       return backend->connect_fn;
-               }
-       }
-
-       return NULL;
-}
-
 /* 
    Return the ldb module form of a database. The URL can either be one of the following forms
    ldb://path
@@ -103,7 +142,7 @@ static ldb_connect_fn ldb_find_backend(const char *url)
   This allows modules to get at only the backend module, for example where a module 
   may wish to direct certain requests at a particular backend.
 */
-int ldb_connect_backend(struct ldb_context *ldb, const char *url, unsigned int flags, const char *options[],
+int ldb_connect_backend(struct ldb_context *ldb, const char *url, const char *options[],
                        struct ldb_module **backend_module)
 {
        int ret;
@@ -120,11 +159,28 @@ int ldb_connect_backend(struct ldb_context *ldb, const char *url, unsigned int f
        fn = ldb_find_backend(backend);
 
        if (fn == NULL) {
-               if (ldb_try_load_dso(ldb, backend) == 0) {
+               int (*init_fn) (void);
+
+               init_fn = ldb_dso_load_symbol(ldb, backend,
+                                             "init_module");
+               if (init_fn != NULL && init_fn() == 0) {
                        fn = ldb_find_backend(backend);
                }
        }
 
+       if (fn == NULL) {
+               struct ldb_backend_ops *ops;
+               char *symbol_name = talloc_asprintf(ldb, "ldb_%s_backend_ops", backend);
+               if (symbol_name == NULL) {
+                       return LDB_ERR_OPERATIONS_ERROR;
+               }
+               ops = ldb_dso_load_symbol(ldb, backend, symbol_name);
+               if (ops != NULL) {
+                       fn = ops->connect_fn;
+               }
+               talloc_free(symbol_name);
+       }
+
        talloc_free(backend);
 
        if (fn == NULL) {
@@ -132,7 +188,7 @@ int ldb_connect_backend(struct ldb_context *ldb, const char *url, unsigned int f
                return LDB_ERR_OTHER;
        }
 
-       ret = fn(ldb, url, flags, options, backend_module);
+       ret = fn(ldb, url, ldb->flags, options, backend_module);
 
        if (ret != LDB_SUCCESS) {
                ldb_debug(ldb, LDB_DEBUG_ERROR, "Failed to connect to '%s'\n", url);
@@ -141,6 +197,75 @@ int ldb_connect_backend(struct ldb_context *ldb, const char *url, unsigned int f
        return ret;
 }
 
+/*
+  try to autodetect a basedn if none specified. This fixes one of my
+  pet hates about ldapsearch, which is that you have to get a long,
+  complex basedn right to make any use of it.
+*/
+void ldb_set_default_dns(struct ldb_context *ldb)
+{
+       TALLOC_CTX *tmp_ctx;
+       int ret;
+       struct ldb_result *res;
+       struct ldb_dn *tmp_dn=NULL;
+       static const char *attrs[] = {
+               "rootDomainNamingContext",
+               "configurationNamingContext",
+               "schemaNamingContext",
+               "defaultNamingContext",
+               NULL
+       };
+
+       tmp_ctx = talloc_new(ldb);
+       ret = ldb_search(ldb, ldb_dn_new(tmp_ctx, ldb, NULL), LDB_SCOPE_BASE, 
+                        "(objectClass=*)", attrs, &res);
+       if (ret == LDB_SUCCESS) {
+               if (res->count == 1) {
+                       if (!ldb_get_opaque(ldb, "rootDomainNamingContext")) {
+                               tmp_dn = ldb_msg_find_attr_as_dn(ldb, ldb, res->msgs[0], "rootDomainNamingContext");
+                               ldb_set_opaque(ldb, "rootDomainNamingContext", tmp_dn);
+                       }
+
+                       if (!ldb_get_opaque(ldb, "configurationNamingContext")) {
+                               tmp_dn = ldb_msg_find_attr_as_dn(ldb, ldb, res->msgs[0], "configurationNamingContext");
+                               ldb_set_opaque(ldb, "configurationNamingContext", tmp_dn);
+                       }
+
+                       if (!ldb_get_opaque(ldb, "schemaNamingContext")) {
+                               tmp_dn = ldb_msg_find_attr_as_dn(ldb, ldb, res->msgs[0], "schemaNamingContext");
+                               ldb_set_opaque(ldb, "schemaNamingContext", tmp_dn);
+                       }
+
+                       if (!ldb_get_opaque(ldb, "defaultNamingContext")) {
+                               tmp_dn = ldb_msg_find_attr_as_dn(ldb, ldb, res->msgs[0], "defaultNamingContext");
+                               ldb_set_opaque(ldb, "defaultNamingContext", tmp_dn);
+                       }
+               }
+               talloc_free(res);
+       }
+
+       talloc_free(tmp_ctx);
+}
+
+struct ldb_dn *ldb_get_root_basedn(struct ldb_context *ldb)
+{
+       return talloc_get_type(ldb_get_opaque(ldb, "rootDomainNamingContext"), struct ldb_dn);
+}
+
+struct ldb_dn *ldb_get_config_basedn(struct ldb_context *ldb)
+{
+       return talloc_get_type(ldb_get_opaque(ldb, "configurationNamingContext"), struct ldb_dn);
+}
+
+struct ldb_dn *ldb_get_schema_basedn(struct ldb_context *ldb)
+{
+       return talloc_get_type(ldb_get_opaque(ldb, "schemaNamingContext"), struct ldb_dn);
+}
+
+struct ldb_dn *ldb_get_default_basedn(struct ldb_context *ldb)
+{
+       return talloc_get_type(ldb_get_opaque(ldb, "defaultNamingContext"), struct ldb_dn);
+}
 
 /* 
  connect to a database. The URL can either be one of the following forms
@@ -155,29 +280,62 @@ int ldb_connect_backend(struct ldb_context *ldb, const char *url, unsigned int f
 int ldb_connect(struct ldb_context *ldb, const char *url, unsigned int flags, const char *options[])
 {
        int ret;
+       const char *url2;
+       /* We seem to need to do this here, or else some utilities don't get ldb backends */
+
+       ldb->flags = flags;
 
-       ret = ldb_connect_backend(ldb, url, flags, options, &ldb->modules);
+       url2 = talloc_strdup(ldb, url);
+       if (!url2) {
+               ldb_oom(ldb);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+       ret = ldb_set_opaque(ldb, "ldb_url", talloc_strdup(ldb, url2));
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
+
+       ret = ldb_connect_backend(ldb, url, options, &ldb->modules);
        if (ret != LDB_SUCCESS) {
                return ret;
        }
 
        if (ldb_load_modules(ldb, options) != LDB_SUCCESS) {
-               ldb_debug(ldb, LDB_DEBUG_FATAL, "Unable to load modules for '%s'\n", url);
+               ldb_debug(ldb, LDB_DEBUG_FATAL, "Unable to load modules for %s: %s\n",
+                         url, ldb_errstring(ldb));
                return LDB_ERR_OTHER;
        }
 
        /* TODO: get timeout from options if available there */
        ldb->default_timeout = 300; /* set default to 5 minutes */
 
+       /* set the default base dn */
+       ldb_set_default_dns(ldb);
+
        return LDB_SUCCESS;
 }
 
-void ldb_set_errstring(struct ldb_context *ldb, char *err_string)
+void ldb_set_errstring(struct ldb_context *ldb, const char *err_string)
 {
        if (ldb->err_string) {
                talloc_free(ldb->err_string);
        }
-       ldb->err_string = talloc_steal(ldb, err_string);
+       ldb->err_string = talloc_strdup(ldb, err_string);
+}
+
+void ldb_asprintf_errstring(struct ldb_context *ldb, const char *format, ...)
+{
+       va_list ap;
+       char *old_string = NULL;
+
+       if (ldb->err_string) {
+               old_string = ldb->err_string;
+       }
+
+       va_start(ap, format);
+       ldb->err_string = talloc_vasprintf(ldb, format, ap);
+       va_end(ap);
+       talloc_free(old_string);
 }
 
 void ldb_reset_err_string(struct ldb_context *ldb)
@@ -192,8 +350,7 @@ void ldb_reset_err_string(struct ldb_context *ldb)
        module = ldb->modules;                                  \
        while (module && module->ops->op == NULL) module = module->next; \
        if (module == NULL) {                                           \
-               ldb_set_errstring(ldb, \
-                                 talloc_asprintf(ldb, "unable to find module or backend to handle operation: " #op)); \
+               ldb_asprintf_errstring(ldb, "unable to find module or backend to handle operation: " #op); \
                return LDB_ERR_OPERATIONS_ERROR;                        \
        } \
 } while (0)
@@ -213,10 +370,10 @@ static int ldb_transaction_start_internal(struct ldb_context *ldb)
        if (status != LDB_SUCCESS) {
                if (ldb->err_string == NULL) {
                        /* no error string was setup by the backend */
-                       ldb_set_errstring(ldb, 
-                                         talloc_asprintf(ldb, "ldb transaction start: %s (%d)", 
-                                                         ldb_strerror(status), 
-                                                         status));
+                       ldb_asprintf_errstring(ldb,
+                                               "ldb transaction start: %s (%d)", 
+                                               ldb_strerror(status), 
+                                               status);
                }
        }
        return status;
@@ -237,10 +394,10 @@ static int ldb_transaction_commit_internal(struct ldb_context *ldb)
        if (status != LDB_SUCCESS) {
                if (ldb->err_string == NULL) {
                        /* no error string was setup by the backend */
-                       ldb_set_errstring(ldb, 
-                                         talloc_asprintf(ldb, "ldb transaction commit: %s (%d)", 
-                                                         ldb_strerror(status), 
-                                                         status));
+                       ldb_asprintf_errstring(ldb, 
+                                               "ldb transaction commit: %s (%d)", 
+                                               ldb_strerror(status), 
+                                               status);
                }
        }
        return status;
@@ -259,10 +416,10 @@ static int ldb_transaction_cancel_internal(struct ldb_context *ldb)
        if (status != LDB_SUCCESS) {
                if (ldb->err_string == NULL) {
                        /* no error string was setup by the backend */
-                       ldb_set_errstring(ldb, 
-                                         talloc_asprintf(ldb, "ldb transaction cancel: %s (%d)", 
-                                                         ldb_strerror(status), 
-                                                         status));
+                       ldb_asprintf_errstring(ldb, 
+                                               "ldb transaction cancel: %s (%d)", 
+                                               ldb_strerror(status), 
+                                               status);
                }
        }
        return status;
@@ -294,7 +451,7 @@ int ldb_transaction_cancel(struct ldb_context *ldb)
        return ldb_transaction_cancel_internal(ldb);
 }
 
-int ldb_autotransaction_start(struct ldb_context *ldb)
+static int ldb_autotransaction_start(struct ldb_context *ldb)
 {
        /* explicit transaction active, ignore autotransaction request */
        if (ldb->transaction_active)
@@ -303,7 +460,7 @@ int ldb_autotransaction_start(struct ldb_context *ldb)
        return ldb_transaction_start_internal(ldb);
 }
 
-int ldb_autotransaction_commit(struct ldb_context *ldb)
+static int ldb_autotransaction_commit(struct ldb_context *ldb)
 {
        /* explicit transaction active, ignore autotransaction request */
        if (ldb->transaction_active)
@@ -312,7 +469,7 @@ int ldb_autotransaction_commit(struct ldb_context *ldb)
        return ldb_transaction_commit_internal(ldb);
 }
 
-int ldb_autotransaction_cancel(struct ldb_context *ldb)
+static int ldb_autotransaction_cancel(struct ldb_context *ldb)
 {
        /* explicit transaction active, ignore autotransaction request */
        if (ldb->transaction_active)
@@ -333,7 +490,7 @@ static int ldb_autotransaction_request(struct ldb_context *ldb, struct ldb_reque
 
        ret = ldb_request(ldb, req);
        if (ret == LDB_SUCCESS) {
-               ret = ldb_async_wait(req->async.handle, LDB_WAIT_ALL);
+               ret = ldb_wait(req->handle, LDB_WAIT_ALL);
        }
 
        if (ret == LDB_SUCCESS) {
@@ -343,21 +500,25 @@ static int ldb_autotransaction_request(struct ldb_context *ldb, struct ldb_reque
 
        if (ldb->err_string == NULL) {
                /* no error string was setup by the backend */
-               ldb_set_errstring(ldb, 
-                                 talloc_asprintf(ldb, "%s (%d)", 
-                                                 ldb_strerror(ret), ret));
+               ldb_asprintf_errstring(ldb, "%s (%d)", ldb_strerror(ret), ret);
        }
 
        return ret;
 }
 
-int ldb_async_wait(struct ldb_async_handle *handle, enum ldb_async_wait_type type)
+int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type type)
 {
+       int ret;
        if (!handle) {
                return LDB_SUCCESS;
        }
 
-       return handle->module->ops->async_wait(handle, type);
+       ret = handle->module->ops->wait(handle, type);
+       if (!ldb_errstring(handle->module->ldb)) {
+               /* Set a default error string, to place the blame somewhere */
+               ldb_asprintf_errstring(handle->module->ldb, "error waiting on module %s: %s (%d)", handle->module->ops->name, ldb_strerror(ret), ret);
+       }
+       return ret;
 }
 
 /* set the specified timeout or, if timeout is 0 set the default timeout */
@@ -367,11 +528,11 @@ int ldb_set_timeout(struct ldb_context *ldb, struct ldb_request *req, int timeou
        if (req == NULL) return LDB_ERR_OPERATIONS_ERROR;
        
        if (timeout != 0) {
-               req->async.timeout = timeout;
+               req->timeout = timeout;
        } else {
-               req->async.timeout = ldb->default_timeout;
+               req->timeout = ldb->default_timeout;
        }
-       req->async.starttime = time(NULL);
+       req->starttime = time(NULL);
 
        return LDB_SUCCESS;
 }
@@ -388,15 +549,25 @@ int ldb_set_timeout_from_prev_req(struct ldb_context *ldb, struct ldb_request *o
        if (oldreq == NULL)
                return ldb_set_timeout(ldb, newreq, 0);
 
-       if ((now - oldreq->async.starttime) > oldreq->async.timeout) {
+       if ((now - oldreq->starttime) > oldreq->timeout) {
                return LDB_ERR_TIME_LIMIT_EXCEEDED;
        }
-       newreq->async.starttime = oldreq->async.starttime;
-       newreq->async.timeout = oldreq->async.timeout - (now - oldreq->async.starttime);
+       newreq->starttime = oldreq->starttime;
+       newreq->timeout = oldreq->timeout - (now - oldreq->starttime);
 
        return LDB_SUCCESS;
 }
 
+
+/* 
+   set the permissions for new files to be passed to open() in
+   backends that use local files
+ */
+void ldb_set_create_perms(struct ldb_context *ldb, unsigned int perms)
+{
+       ldb->create_perms = perms;
+}
+
 /*
   start an ldb request
   NOTE: the request must be a talloc context.
@@ -431,6 +602,10 @@ int ldb_request(struct ldb_context *ldb, struct ldb_request *req)
                FIRST_OP(ldb, rename);
                ret = module->ops->rename(module, req);
                break;
+       case LDB_EXTENDED:
+               FIRST_OP(ldb, extended);
+               ret = module->ops->extended(module, req);
+               break;
        case LDB_SEQUENCE_NUMBER:
                FIRST_OP(ldb, sequence_number);
                ret = module->ops->sequence_number(module, req);
@@ -452,23 +627,25 @@ int ldb_request(struct ldb_context *ldb, struct ldb_request *req)
   Use talloc_free to free the ldb_message returned in 'res', if successful
 
 */
-static int ldb_search_callback(struct ldb_context *ldb, void *context, struct ldb_async_result *ares)
+int ldb_search_default_callback(struct ldb_context *ldb, void *context, struct ldb_reply *ares)
 {
        struct ldb_result *res;
        int n;
        
        if (!context) {
-               ldb_set_errstring(ldb, talloc_asprintf(ldb, "NULL Context in callback"));
+               ldb_set_errstring(ldb, "NULL Context in callback");
                return LDB_ERR_OPERATIONS_ERROR;
        }       
 
-       res = *((struct ldb_result **)context);
+       res = talloc_get_type(context, struct ldb_result);
 
        if (!res || !ares) {
+               ldb_set_errstring(ldb, "NULL res or ares in callback");
                goto error;
        }
 
-       if (ares->type == LDB_REPLY_ENTRY) {
+       switch (ares->type) {
+       case LDB_REPLY_ENTRY:
                res->msgs = talloc_realloc(res, res->msgs, struct ldb_message *, res->count + 2);
                if (! res->msgs) {
                        goto error;
@@ -476,15 +653,10 @@ static int ldb_search_callback(struct ldb_context *ldb, void *context, struct ld
 
                res->msgs[res->count + 1] = NULL;
 
-               res->msgs[res->count] = talloc_steal(res->msgs, ares->message);
-               if (! res->msgs[res->count]) {
-                       goto error;
-               }
-
+               res->msgs[res->count] = talloc_move(res->msgs, &ares->message);
                res->count++;
-       }
-
-       if (ares->type == LDB_REPLY_REFERRAL) {
+               break;
+       case LDB_REPLY_REFERRAL:
                if (res->refs) {
                        for (n = 0; res->refs[n]; n++) /*noop*/ ;
                } else {
@@ -496,80 +668,380 @@ static int ldb_search_callback(struct ldb_context *ldb, void *context, struct ld
                        goto error;
                }
 
-               res->refs[n] = talloc_steal(res->refs, ares->referral);
+               res->refs[n] = talloc_move(res->refs, &ares->referral);
                res->refs[n + 1] = NULL;
+               break;
+       case LDB_REPLY_EXTENDED:
+       case LDB_REPLY_DONE:
+               /* TODO: we should really support controls on entries and referrals too! */
+               res->controls = talloc_move(res, &ares->controls);
+               break;          
        }
-
-       if (ares->controls) {
-               res->controls = talloc_steal(res, ares->controls);
-               if (! res->controls) {
-                       goto error;
-               }
-       }
-
        talloc_free(ares);
        return LDB_SUCCESS;
 
 error:
        talloc_free(ares);
-       talloc_free(res);
-       *((struct ldb_result **)context) = NULL;
        return LDB_ERR_OPERATIONS_ERROR;
 }
 
-int ldb_search(struct ldb_context *ldb, 
-              const struct ldb_dn *base,
-              enum ldb_scope scope,
-              const char *expression,
-              const char * const *attrs, 
-              struct ldb_result **res)
+int ldb_build_search_req(struct ldb_request **ret_req,
+                       struct ldb_context *ldb,
+                       void *mem_ctx,
+                       struct ldb_dn *base,
+                       enum ldb_scope scope,
+                       const char *expression,
+                       const char * const *attrs,
+                       struct ldb_control **controls,
+                       void *context,
+                       ldb_request_callback_t callback)
 {
        struct ldb_request *req;
-       int ret;
 
-       *res = talloc_zero(ldb, struct ldb_result);
-       if (! *res) {
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
+       *ret_req = NULL;
 
-       req = talloc(ldb, struct ldb_request);
+       req = talloc(mem_ctx, struct ldb_request);
        if (req == NULL) {
-               ldb_set_errstring(ldb, talloc_strdup(ldb, "Out of memory!"));
+               ldb_set_errstring(ldb, "Out of Memory");
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
        req->operation = LDB_SEARCH;
-       req->op.search.base = base;
+       if (base == NULL) {
+               req->op.search.base = ldb_dn_new(req, ldb, NULL);
+       } else {
+               req->op.search.base = base;
+       }
        req->op.search.scope = scope;
 
        req->op.search.tree = ldb_parse_tree(req, expression);
        if (req->op.search.tree == NULL) {
-               ldb_set_errstring(ldb, talloc_strdup(ldb, "Unable to parse search expression"));
+               ldb_set_errstring(ldb, "Unable to parse search expression");
                talloc_free(req);
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
        req->op.search.attrs = attrs;
-       req->controls = NULL;
-       req->async.context = res;
-       req->async.callback = ldb_search_callback;
+       req->controls = controls;
+       req->context = context;
+       req->callback = callback;
+
+       *ret_req = req;
+       return LDB_SUCCESS;
+}
+
+int ldb_build_add_req(struct ldb_request **ret_req,
+                       struct ldb_context *ldb,
+                       void *mem_ctx,
+                       const struct ldb_message *message,
+                       struct ldb_control **controls,
+                       void *context,
+                       ldb_request_callback_t callback)
+{
+       struct ldb_request *req;
+
+       *ret_req = NULL;
+
+       req = talloc(mem_ctx, struct ldb_request);
+       if (req == NULL) {
+               ldb_set_errstring(ldb, "Out of Memory");
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       req->operation = LDB_ADD;
+       req->op.add.message = message;
+       req->controls = controls;
+       req->context = context;
+       req->callback = callback;
+
+       *ret_req = req;
+
+       return LDB_SUCCESS;
+}
+
+int ldb_build_mod_req(struct ldb_request **ret_req,
+                       struct ldb_context *ldb,
+                       void *mem_ctx,
+                       const struct ldb_message *message,
+                       struct ldb_control **controls,
+                       void *context,
+                       ldb_request_callback_t callback)
+{
+       struct ldb_request *req;
+
+       *ret_req = NULL;
+
+       req = talloc(mem_ctx, struct ldb_request);
+       if (req == NULL) {
+               ldb_set_errstring(ldb, "Out of Memory");
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       req->operation = LDB_MODIFY;
+       req->op.mod.message = message;
+       req->controls = controls;
+       req->context = context;
+       req->callback = callback;
+
+       *ret_req = req;
+
+       return LDB_SUCCESS;
+}
+
+int ldb_build_del_req(struct ldb_request **ret_req,
+                       struct ldb_context *ldb,
+                       void *mem_ctx,
+                       struct ldb_dn *dn,
+                       struct ldb_control **controls,
+                       void *context,
+                       ldb_request_callback_t callback)
+{
+       struct ldb_request *req;
+
+       *ret_req = NULL;
+
+       req = talloc(mem_ctx, struct ldb_request);
+       if (req == NULL) {
+               ldb_set_errstring(ldb, "Out of Memory");
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       req->operation = LDB_DELETE;
+       req->op.del.dn = dn;
+       req->controls = controls;
+       req->context = context;
+       req->callback = callback;
+
+       *ret_req = req;
+
+       return LDB_SUCCESS;
+}
+
+int ldb_build_rename_req(struct ldb_request **ret_req,
+                       struct ldb_context *ldb,
+                       void *mem_ctx,
+                       struct ldb_dn *olddn,
+                       struct ldb_dn *newdn,
+                       struct ldb_control **controls,
+                       void *context,
+                       ldb_request_callback_t callback)
+{
+       struct ldb_request *req;
+
+       *ret_req = NULL;
+
+       req = talloc(mem_ctx, struct ldb_request);
+       if (req == NULL) {
+               ldb_set_errstring(ldb, "Out of Memory");
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       req->operation = LDB_RENAME;
+       req->op.rename.olddn = olddn;
+       req->op.rename.newdn = newdn;
+       req->controls = controls;
+       req->context = context;
+       req->callback = callback;
+
+       *ret_req = req;
+
+       return LDB_SUCCESS;
+}
+
+int ldb_extended_default_callback(struct ldb_context *ldb, void *context, struct ldb_reply *ares)
+{
+       struct ldb_result *res;
+       
+       if (!context) {
+               ldb_set_errstring(ldb, "NULL Context in callback");
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       res = talloc_get_type(context, struct ldb_result);
+       if (!res || !ares) {
+               ldb_set_errstring(ldb, "NULL res or ares in callback");
+               goto error;
+       }
+
+       switch (ares->type) {
+       case LDB_REPLY_ENTRY:
+       case LDB_REPLY_REFERRAL:
+       case LDB_REPLY_DONE:
+               ldb_set_errstring(ldb, "invalid ares type in callback");
+               goto error;
+       case LDB_REPLY_EXTENDED:
+               /* TODO: we should really support controls on entries and referrals too! */
+               res->extended = talloc_move(res, &ares->response);
+               res->controls = talloc_move(res, &ares->controls);
+               break;          
+       }
+       talloc_free(ares);
+       return LDB_SUCCESS;
+
+error:
+       talloc_free(ares);
+       return LDB_ERR_OPERATIONS_ERROR;
+}
+
+int ldb_build_extended_req(struct ldb_request **ret_req,
+                          struct ldb_context *ldb,
+                          void *mem_ctx,
+                          const char *oid,
+                          void *data,
+                          struct ldb_control **controls,
+                          void *context,
+                          ldb_request_callback_t callback)
+{
+       struct ldb_request *req;
+
+       *ret_req = NULL;
+
+       req = talloc(mem_ctx, struct ldb_request);
+       if (req == NULL) {
+               ldb_set_errstring(ldb, "Out of Memory");
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       req->operation = LDB_EXTENDED;
+       req->op.extended.oid = oid;
+       req->op.extended.data = data;
+       req->controls = controls;
+       req->context = context;
+       req->callback = callback;
+
+       *ret_req = req;
+
+       return LDB_SUCCESS;
+}
+
+int ldb_extended(struct ldb_context *ldb, 
+                const char *oid,
+                void *data,
+                struct ldb_result **_res)
+{
+       struct ldb_request *req;
+       int ret;
+       struct ldb_result *res;
+
+       *_res = NULL;
+
+       res = talloc_zero(ldb, struct ldb_result);
+       if (!res) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       ret = ldb_build_extended_req(&req, ldb, ldb,
+                                    oid, data, NULL,
+                                    res, ldb_extended_default_callback);
+       if (ret != LDB_SUCCESS) goto done;
+
        ldb_set_timeout(ldb, req, 0); /* use default timeout */
 
        ret = ldb_request(ldb, req);
        
        if (ret == LDB_SUCCESS) {
-               ret = ldb_async_wait(req->async.handle, LDB_WAIT_ALL);
+               ret = ldb_wait(req->handle, LDB_WAIT_ALL);
        }
-       
+
+       talloc_free(req);
+
+done:
        if (ret != LDB_SUCCESS) {
-               talloc_free(*res);
-               *res = NULL;
+               talloc_free(res);
+       }
+
+       *_res = res;
+       return ret;
+}
+
+/*
+  note that ldb_search() will automatically replace a NULL 'base' value with the 
+  defaultNamingContext from the rootDSE if available.
+*/
+int ldb_search(struct ldb_context *ldb, 
+              struct ldb_dn *base,
+              enum ldb_scope scope,
+              const char *expression,
+              const char * const *attrs, 
+              struct ldb_result **_res)
+{
+       struct ldb_request *req;
+       int ret;
+       struct ldb_result *res;
+
+       *_res = NULL;
+
+       res = talloc_zero(ldb, struct ldb_result);
+       if (!res) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       ret = ldb_build_search_req(&req, ldb, ldb,
+                                       base?base:ldb_get_default_basedn(ldb),
+                                       scope,
+                                       expression,
+                                       attrs,
+                                       NULL,
+                                       res,
+                                       ldb_search_default_callback);
+
+       if (ret != LDB_SUCCESS) goto done;
+
+       ldb_set_timeout(ldb, req, 0); /* use default timeout */
+
+       ret = ldb_request(ldb, req);
+       
+       if (ret == LDB_SUCCESS) {
+               ret = ldb_wait(req->handle, LDB_WAIT_ALL);
        }
 
        talloc_free(req);
+
+done:
+       if (ret != LDB_SUCCESS) {
+               talloc_free(res);
+       }
+
+       *_res = res;
        return ret;
 }
 
+/*
+ a useful search function where you can easily define the expression and that
+ takes a memory context where results are allocated
+*/
+
+int ldb_search_exp_fmt(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, struct ldb_result **result,
+                        struct ldb_dn *base, enum ldb_scope scope, const char * const *attrs,
+                        const char *exp_fmt, ...)
+{
+       struct ldb_result *res;
+       char *expression;
+       va_list ap;
+       int ret;
+
+       res = NULL;
+       *result = NULL;
+
+       va_start(ap, exp_fmt);
+       expression = talloc_vasprintf(mem_ctx, exp_fmt, ap);
+       va_end(ap);
+
+       if ( ! expression) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       ret = ldb_search(ldb, base, scope, expression, attrs, &res);
+
+       if (ret == LDB_SUCCESS) {
+               talloc_steal(mem_ctx, res);
+               *result = res;
+       }
+
+       talloc_free(expression);
+
+       return ret;
+}
 
 /*
   add a record to the database. Will fail if a record with the given class and key
@@ -581,20 +1053,19 @@ int ldb_add(struct ldb_context *ldb,
        struct ldb_request *req;
        int ret;
 
-       ret = ldb_msg_sanity_check(message);
-       if (ret != LDB_SUCCESS) return ret;
-
-       req = talloc(ldb, struct ldb_request);
-       if (req == NULL) {
-               ldb_set_errstring(ldb, talloc_strdup(ldb, "Out of memory!"));
-               return LDB_ERR_OPERATIONS_ERROR;
+       ret = ldb_msg_sanity_check(ldb, message);
+       if (ret != LDB_SUCCESS) {
+               return ret;
        }
 
-       req->operation = LDB_ADD;
-       req->op.add.message = message;
-       req->controls = NULL;
-       req->async.context = NULL;
-       req->async.callback = NULL;
+       ret = ldb_build_add_req(&req, ldb, ldb,
+                                       message,
+                                       NULL,
+                                       NULL,
+                                       NULL);
+
+       if (ret != LDB_SUCCESS) return ret;
+
        ldb_set_timeout(ldb, req, 0); /* use default timeout */
 
        /* do request and autostart a transaction */
@@ -613,20 +1084,19 @@ int ldb_modify(struct ldb_context *ldb,
        struct ldb_request *req;
        int ret;
 
-       ret = ldb_msg_sanity_check(message);
-       if (ret != LDB_SUCCESS) return ret;
-
-       req = talloc(ldb, struct ldb_request);
-       if (req == NULL) {
-               ldb_set_errstring(ldb, talloc_strdup(ldb, "Out of memory!"));
-               return LDB_ERR_OPERATIONS_ERROR;
+       ret = ldb_msg_sanity_check(ldb, message);
+       if (ret != LDB_SUCCESS) {
+               return ret;
        }
 
-       req->operation = LDB_MODIFY;
-       req->op.add.message = message;
-       req->controls = NULL;
-       req->async.context = NULL;
-       req->async.callback = NULL;
+       ret = ldb_build_mod_req(&req, ldb, ldb,
+                                       message,
+                                       NULL,
+                                       NULL,
+                                       NULL);
+
+       if (ret != LDB_SUCCESS) return ret;
+
        ldb_set_timeout(ldb, req, 0); /* use default timeout */
 
        /* do request and autostart a transaction */
@@ -640,22 +1110,19 @@ int ldb_modify(struct ldb_context *ldb,
 /*
   delete a record from the database
 */
-int ldb_delete(struct ldb_context *ldb, const struct ldb_dn *dn)
+int ldb_delete(struct ldb_context *ldb, struct ldb_dn *dn)
 {
        struct ldb_request *req;
        int ret;
 
-       req = talloc(ldb, struct ldb_request);
-       if (req == NULL) {
-               ldb_set_errstring(ldb, talloc_strdup(ldb, "Out of memory!"));
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
+       ret = ldb_build_del_req(&req, ldb, ldb,
+                                       dn,
+                                       NULL,
+                                       NULL,
+                                       NULL);
+
+       if (ret != LDB_SUCCESS) return ret;
 
-       req->operation = LDB_DELETE;
-       req->op.del.dn = dn;
-       req->controls = NULL;
-       req->async.context = NULL;
-       req->async.callback = NULL;
        ldb_set_timeout(ldb, req, 0); /* use default timeout */
 
        /* do request and autostart a transaction */
@@ -668,23 +1135,20 @@ int ldb_delete(struct ldb_context *ldb, const struct ldb_dn *dn)
 /*
   rename a record in the database
 */
-int ldb_rename(struct ldb_context *ldb, const struct ldb_dn *olddn, const struct ldb_dn *newdn)
+int ldb_rename(struct ldb_context *ldb, struct ldb_dn *olddn, struct ldb_dn *newdn)
 {
        struct ldb_request *req;
        int ret;
 
-       req = talloc(ldb, struct ldb_request);
-       if (req == NULL) {
-               ldb_set_errstring(ldb, talloc_strdup(ldb, "Out of memory!"));
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
+       ret = ldb_build_rename_req(&req, ldb, ldb,
+                                       olddn,
+                                       newdn,
+                                       NULL,
+                                       NULL,
+                                       NULL);
+
+       if (ret != LDB_SUCCESS) return ret;
 
-       req->operation = LDB_RENAME;
-       req->op.rename.olddn = olddn;
-       req->op.rename.newdn = newdn;
-       req->controls = NULL;
-       req->async.context = NULL;
-       req->async.callback = NULL;
        ldb_set_timeout(ldb, req, 0); /* use default timeout */
 
        /* do request and autostart a transaction */
@@ -696,25 +1160,26 @@ int ldb_rename(struct ldb_context *ldb, const struct ldb_dn *olddn, const struct
 
 
 /*
-  rename a record in the database
+  return the global sequence number
 */
-int ldb_sequence_number(struct ldb_context *ldb, uint64_t *seq_num)
+int ldb_sequence_number(struct ldb_context *ldb, enum ldb_sequence_type type, uint64_t *seq_num)
 {
        struct ldb_request *req;
        int ret;
 
        req = talloc(ldb, struct ldb_request);
        if (req == NULL) {
-               ldb_set_errstring(ldb, talloc_strdup(ldb, "Out of memory!"));
+               ldb_set_errstring(ldb, "Out of Memory");
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
        req->operation = LDB_SEQUENCE_NUMBER;
        req->controls = NULL;
-       req->async.context = NULL;
-       req->async.callback = NULL;
+       req->context = NULL;
+       req->callback = NULL;
        ldb_set_timeout(ldb, req, 0); /* use default timeout */
 
+       req->op.seq_num.type = type;
        /* do request and autostart a transaction */
        ret = ldb_request(ldb, req);