r19402: - use the new tdb_lockall_read() to make ldb_search() more efficient,
[jra/samba/.git] / source4 / lib / ldb / ldb_tdb / ldb_tdb.c
index eb2decfe310a863e547548aed391c5e5e97f24cd..3f9db3909734d119ce9595f56cbc44c0d49a23a2 100644 (file)
@@ -2,6 +2,9 @@
    ldb database library
 
    Copyright (C) Andrew Tridgell  2004
+   Copyright (C) Stefan Metzmacher  2004
+   Copyright (C) Simo Sorce       2006
+   
 
      ** NOTE! The following LGPL license applies to the ldb
      ** library. This does NOT imply that all of Samba is released
 */
 
 /*
- *  Name: ldb
+ *  Name: ldb_tdb
  *
  *  Component: ldb tdb backend
  *
  *  Description: core functions for tdb backend
  *
  *  Author: Andrew Tridgell
+ *  Author: Stefan Metzmacher
+ *
+ *  Modifications:
+ *
+ *  - description: make the module use asyncronous calls
+ *    date: Feb 2006
+ *    Author: Simo Sorce
  */
 
 #include "includes.h"
+#include "ldb/include/includes.h"
+
 #include "ldb/ldb_tdb/ldb_tdb.h"
 
+
+/*
+  map a tdb error code to a ldb error code
+*/
+static int ltdb_err_map(enum TDB_ERROR tdb_code)
+{
+       switch (tdb_code) {
+       case TDB_SUCCESS:
+               return LDB_SUCCESS;
+       case TDB_ERR_CORRUPT:
+       case TDB_ERR_OOM:
+       case TDB_ERR_EINVAL:
+               return LDB_ERR_OPERATIONS_ERROR;
+       case TDB_ERR_IO:
+               return LDB_ERR_PROTOCOL_ERROR;
+       case TDB_ERR_LOCK:
+       case TDB_ERR_NOLOCK:
+               return LDB_ERR_BUSY;
+       case TDB_ERR_LOCK_TIMEOUT:
+               return LDB_ERR_TIME_LIMIT_EXCEEDED;
+       case TDB_ERR_EXISTS:
+               return LDB_ERR_ENTRY_ALREADY_EXISTS;
+       case TDB_ERR_NOEXIST:
+               return LDB_ERR_NO_SUCH_OBJECT;
+       case TDB_ERR_RDONLY:
+               return LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
+       }
+       return LDB_ERR_OTHER;
+}
+
+
+struct ldb_handle *init_ltdb_handle(struct ltdb_private *ltdb, struct ldb_module *module,
+                                   struct ldb_request *req)
+{
+       struct ltdb_context *ac;
+       struct ldb_handle *h;
+
+       h = talloc_zero(req, struct ldb_handle);
+       if (h == NULL) {
+               ldb_set_errstring(module->ldb, "Out of Memory");
+               return NULL;
+       }
+
+       h->module = module;
+
+       ac = talloc_zero(h, struct ltdb_context);
+       if (ac == NULL) {
+               ldb_set_errstring(module->ldb, "Out of Memory");
+               talloc_free(h);
+               return NULL;
+       }
+
+       h->private_data = (void *)ac;
+
+       h->state = LDB_ASYNC_INIT;
+       h->status = LDB_SUCCESS;
+
+       ac->module = module;
+       ac->context = req->context;
+       ac->callback = req->callback;
+
+       return h;
+}
+
 /*
   form a TDB_DATA for a record key
   caller frees
   note that the key for a record can depend on whether the 
   dn refers to a case sensitive index record or not
 */
-struct TDB_DATA ltdb_key(struct ldb_context *ldb, const char *dn)
+struct TDB_DATA ltdb_key(struct ldb_module *module, const struct ldb_dn *dn)
 {
+       struct ldb_context *ldb = module->ldb;
        TDB_DATA key;
        char *key_str = NULL;
        char *dn_folded = NULL;
-       const char *prefix = LTDB_INDEX ":";
-       const char *s;
-       int flags;
 
        /*
          most DNs are case insensitive. The exception is index DNs for
          case sensitive attributes
+
+         there are 3 cases dealt with in this code:
+
+         1) if the dn doesn't start with @ then uppercase the attribute
+             names and the attributes values of case insensitive attributes
+         2) if the dn starts with @ then leave it alone - the indexing code handles
+            the rest
        */
-       if (strncmp(dn, prefix, strlen(prefix)) == 0 &&
-           (s = strchr(dn+strlen(prefix), ':'))) {
-               char *attr_name, *attr_name_folded;
-               attr_name = strndup(dn+strlen(prefix), (s-(dn+strlen(prefix))));
-               if (!attr_name) {
-                       goto failed;
-               }
-               flags = ltdb_attribute_flags(ldb, attr_name);
-               
-               if (flags & LTDB_FLAG_CASE_INSENSITIVE) {
-                       dn_folded = ldb_casefold(dn);
-               } else {
-                       attr_name_folded = ldb_casefold(attr_name);
-                       if (!attr_name_folded) {
-                               goto failed;
-                       }
-                       asprintf(&dn_folded, "%s:%s:%s",
-                                prefix, attr_name_folded,
-                                s+1);
-                       free(attr_name_folded);
-               }
-               free(attr_name);
-       } else {
-               dn_folded = ldb_casefold(dn);
-       }
 
+       dn_folded = ldb_dn_linearize_casefold(ldb, ldb, dn);
        if (!dn_folded) {
                goto failed;
        }
 
-       asprintf(&key_str, "DN=%s", dn_folded);
-       free(dn_folded);
+       key_str = talloc_asprintf(ldb, "DN=%s", dn_folded);
+
+       talloc_free(dn_folded);
 
        if (!key_str) {
                goto failed;
        }
 
-       key.dptr = key_str;
-       key.dsize = strlen(key_str)+1;
+       key.dptr = (uint8_t *)key_str;
+       key.dsize = strlen(key_str) + 1;
 
        return key;
 
@@ -105,42 +163,30 @@ failed:
 }
 
 /*
-  lock the database for write - currently a single lock is used
+  check special dn's have valid attributes
+  currently only @ATTRIBUTES is checked
 */
-static int ltdb_lock(struct ldb_context *ldb)
+int ltdb_check_special_dn(struct ldb_module *module, const struct ldb_message *msg)
 {
-       struct ltdb_private *ltdb = ldb->private_data;
-       TDB_DATA key;
-       int ret;
-
-       key = ltdb_key(ldb, "LDBLOCK");
-       if (!key.dptr) {
-               return -1;
+       int i, j;
+       if (! ldb_dn_is_special(msg->dn) ||
+           ! ldb_dn_check_special(msg->dn, LTDB_ATTRIBUTES)) {
+               return 0;
        }
 
-       ret = tdb_chainlock(ltdb->tdb, key);
-
-       free(key.dptr);
-
-       return ret;
-}
-
-/*
-  unlock the database after a ltdb_lock()
-*/
-static void ltdb_unlock(struct ldb_context *ldb)
-{
-       struct ltdb_private *ltdb = ldb->private_data;
-       TDB_DATA key;
-
-       key = ltdb_key(ldb, "LDBLOCK");
-       if (!key.dptr) {
-               return;
+       /* we have @ATTRIBUTES, let's check attributes are fine */
+       /* should we check that we deny multivalued attributes ? */
+       for (i = 0; i < msg->num_elements; i++) {
+               for (j = 0; j < msg->elements[i].num_values; j++) {
+                       if (ltdb_check_at_attributes_values(&msg->elements[i].values[j]) != 0) {
+                               ldb_set_errstring(module->ldb, "Invalid attribute value in an @ATTRIBUTES entry");
+                               return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
+                       }
+               }
        }
 
-       tdb_chainunlock(ltdb->tdb, key);
-
-       free(key.dptr);
+       return 0;
 }
 
 
@@ -148,18 +194,20 @@ static void ltdb_unlock(struct ldb_context *ldb)
   we've made a modification to a dn - possibly reindex and 
   update sequence number
 */
-static int ltdb_modified(struct ldb_context *ldb, const char *dn)
+static int ltdb_modified(struct ldb_module *module, const struct ldb_dn *dn)
 {
        int ret = 0;
 
-       if (strcmp(dn, LTDB_INDEXLIST) == 0 ||
-           strcmp(dn, LTDB_ATTRIBUTES) == 0) {
-               ret = ltdb_reindex(ldb);
+       if (ldb_dn_is_special(dn) &&
+           (ldb_dn_check_special(dn, LTDB_INDEXLIST) ||
+            ldb_dn_check_special(dn, LTDB_ATTRIBUTES)) ) {
+               ret = ltdb_reindex(module);
        }
 
        if (ret == 0 &&
-           strcmp(dn, LTDB_BASEINFO) != 0) {
-               ret = ltdb_increase_sequence_number(ldb);
+           !(ldb_dn_is_special(dn) &&
+             ldb_dn_check_special(dn, LTDB_BASEINFO)) ) {
+               ret = ltdb_increase_sequence_number(module);
        }
 
        return ret;
@@ -168,137 +216,225 @@ static int ltdb_modified(struct ldb_context *ldb, const char *dn)
 /*
   store a record into the db
 */
-int ltdb_store(struct ldb_context *ldb, const struct ldb_message *msg, int flgs)
+int ltdb_store(struct ldb_module *module, const struct ldb_message *msg, int flgs)
 {
-       struct ltdb_private *ltdb = ldb->private_data;
+       struct ltdb_private *ltdb =
+               talloc_get_type(module->private_data, struct ltdb_private);
        TDB_DATA tdb_key, tdb_data;
        int ret;
 
-       tdb_key = ltdb_key(ldb, msg->dn);
+       tdb_key = ltdb_key(module, msg->dn);
        if (!tdb_key.dptr) {
-               return -1;
+               return LDB_ERR_OTHER;
        }
 
-       ret = ltdb_pack_data(ldb, msg, &tdb_data);
+       ret = ltdb_pack_data(module, msg, &tdb_data);
        if (ret == -1) {
-               free(tdb_key.dptr);
-               return -1;
+               talloc_free(tdb_key.dptr);
+               return LDB_ERR_OTHER;
        }
 
        ret = tdb_store(ltdb->tdb, tdb_key, tdb_data, flgs);
        if (ret == -1) {
+               ret = ltdb_err_map(tdb_error(ltdb->tdb));
                goto done;
        }
        
-       ret = ltdb_index_add(ldb, msg);
+       ret = ltdb_index_add(module, msg);
        if (ret == -1) {
                tdb_delete(ltdb->tdb, tdb_key);
        }
 
 done:
-       free(tdb_key.dptr);
-       free(tdb_data.dptr);
+       talloc_free(tdb_key.dptr);
+       talloc_free(tdb_data.dptr);
 
        return ret;
 }
 
 
-/*
-  add a record to the database
-*/
-static int ltdb_add(struct ldb_context *ldb, const struct ldb_message *msg)
+static int ltdb_add_internal(struct ldb_module *module, const struct ldb_message *msg)
 {
        int ret;
-
-       if (ltdb_lock(ldb) != 0) {
-               return -1;
+       
+       ret = ltdb_check_special_dn(module, msg);
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
+       
+       if (ltdb_cache_load(module) != 0) {
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       if (ltdb_cache_load(ldb) != 0) {
-               ltdb_unlock(ldb);
-               return -1;
+       ret = ltdb_store(module, msg, TDB_INSERT);
+
+       if (ret == LDB_ERR_ENTRY_ALREADY_EXISTS) {
+               char *dn;
+
+               dn = ldb_dn_linearize(module, msg->dn);
+               if (!dn) {
+                       return ret;
+               }
+               ldb_asprintf_errstring(module->ldb, "Entry %s already exists", dn);
+               talloc_free(dn);
+               return ret;
        }
        
-       ret = ltdb_store(ldb, msg, TDB_INSERT);
-
-       if (ret == 0) {
-               ltdb_modified(ldb, msg->dn);
+       if (ret == LDB_SUCCESS) {
+               ret = ltdb_modified(module, msg->dn);
+               if (ret != LDB_SUCCESS) {
+                       return LDB_ERR_OPERATIONS_ERROR;
+               }
        }
 
-       ltdb_unlock(ldb);
        return ret;
 }
 
+/*
+  add a record to the database
+*/
+static int ltdb_add(struct ldb_module *module, struct ldb_request *req)
+{
+       struct ltdb_private *ltdb = talloc_get_type(module->private_data, struct ltdb_private);
+       struct ltdb_context *ltdb_ac;
+       int tret, ret = LDB_SUCCESS;
+
+       if (req->controls != NULL) {
+               ldb_debug(module->ldb, LDB_DEBUG_WARNING, "Controls should not reach the ldb_tdb backend!\n");
+               if (check_critical_controls(req->controls)) {
+                       return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION;
+               }
+       }
+       
+       req->handle = init_ltdb_handle(ltdb, module, req);
+       if (req->handle == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+       ltdb_ac = talloc_get_type(req->handle->private_data, struct ltdb_context);
+
+       tret = ltdb_add_internal(module, req->op.add.message);
+       if (tret != LDB_SUCCESS) {
+               req->handle->status = tret;
+               goto done;
+       }
+       
+       if (ltdb_ac->callback) {
+               ret = ltdb_ac->callback(module->ldb, ltdb_ac->context, NULL);
+       }
+done:
+       req->handle->state = LDB_ASYNC_DONE;
+       return ret;
+}
 
 /*
   delete a record from the database, not updating indexes (used for deleting
   index records)
 */
-int ltdb_delete_noindex(struct ldb_context *ldb, const char *dn)
+int ltdb_delete_noindex(struct ldb_module *module, const struct ldb_dn *dn)
 {
-       struct ltdb_private *ltdb = ldb->private_data;
+       struct ltdb_private *ltdb =
+               talloc_get_type(module->private_data, struct ltdb_private);
        TDB_DATA tdb_key;
        int ret;
 
-       tdb_key = ltdb_key(ldb, dn);
+       tdb_key = ltdb_key(module, dn);
        if (!tdb_key.dptr) {
-               return -1;
+               return LDB_ERR_OTHER;
        }
 
        ret = tdb_delete(ltdb->tdb, tdb_key);
-       free(tdb_key.dptr);
+       talloc_free(tdb_key.dptr);
+
+       if (ret != 0) {
+               ret = ltdb_err_map(tdb_error(ltdb->tdb));
+       }
 
        return ret;
 }
 
-/*
-  delete a record from the database
-*/
-static int ltdb_delete(struct ldb_context *ldb, const char *dn)
+static int ltdb_delete_internal(struct ldb_module *module, const struct ldb_dn *dn)
 {
+       struct ldb_message *msg;
        int ret;
-       struct ldb_message msg;
 
-       if (ltdb_lock(ldb) != 0) {
-               return -1;
-       }
-
-       if (ltdb_cache_load(ldb) != 0) {
-               ltdb_unlock(ldb);
-               return -1;
+       msg = talloc(module, struct ldb_message);
+       if (msg == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        /* in case any attribute of the message was indexed, we need
           to fetch the old record */
-       ret = ltdb_search_dn1(ldb, dn, &msg);
+       ret = ltdb_search_dn1(module, dn, msg);
        if (ret != 1) {
                /* not finding the old record is an error */
-               goto failed;
+               talloc_free(msg);
+               return LDB_ERR_NO_SUCH_OBJECT;
        }
 
-       ret = ltdb_delete_noindex(ldb, dn);
-       if (ret == -1) {
-               ltdb_search_dn1_free(ldb, &msg);
-               goto failed;
+       ret = ltdb_delete_noindex(module, dn);
+       if (ret != LDB_SUCCESS) {
+               talloc_free(msg);
+               return LDB_ERR_NO_SUCH_OBJECT;
        }
 
        /* remove any indexed attributes */
-       ret = ltdb_index_del(ldb, &msg);
+       ret = ltdb_index_del(module, msg);
+       if (ret != LDB_SUCCESS) {
+               talloc_free(msg);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       ret = ltdb_modified(module, dn);
+       if (ret != LDB_SUCCESS) {
+               talloc_free(msg);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       talloc_free(msg);
+       return LDB_SUCCESS;
+}
 
-       ltdb_search_dn1_free(ldb, &msg);
+/*
+  delete a record from the database
+*/
+static int ltdb_delete(struct ldb_module *module, struct ldb_request *req)
+{
+       struct ltdb_private *ltdb = talloc_get_type(module->private_data, struct ltdb_private);
+       struct ltdb_context *ltdb_ac;
+       int tret, ret = LDB_SUCCESS;
+
+       if (req->controls != NULL) {
+               ldb_debug(module->ldb, LDB_DEBUG_WARNING, "Controls should not reach the ldb_tdb backend!\n");
+               if (check_critical_controls(req->controls)) {
+                       return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION;
+               }
+       }
+       
+       req->handle = NULL;
 
-       if (ret == 0) {
-               ltdb_modified(ldb, dn);
+       if (ltdb_cache_load(module) != 0) {
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       ltdb_unlock(ldb);
-       return ret;
+       req->handle = init_ltdb_handle(ltdb, module, req);
+       if (req->handle == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+       ltdb_ac = talloc_get_type(req->handle->private_data, struct ltdb_context);
 
-failed:
-       ltdb_unlock(ldb);
-       return -1;
-}
+       tret = ltdb_delete_internal(module, req->op.del.dn);
+       if (tret != LDB_SUCCESS) {
+               req->handle->status = tret; 
+               goto done;
+       }
 
+       if (ltdb_ac->callback) {
+               ret = ltdb_ac->callback(module->ldb, ltdb_ac->context, NULL);
+       }
+done:
+       req->handle->state = LDB_ASYNC_DONE;
+       return ret;
+}
 
 /*
   find an element by attribute name. At the moment this does a linear search, it should
@@ -309,7 +445,7 @@ failed:
 */
 static int find_element(const struct ldb_message *msg, const char *name)
 {
-       int i;
+       unsigned int i;
        for (i=0;i<msg->num_elements;i++) {
                if (ldb_attr_cmp(msg->elements[i].name, name) == 0) {
                        return i;
@@ -326,13 +462,14 @@ static int find_element(const struct ldb_message *msg, const char *name)
 
   returns 0 on success, -1 on failure (and sets errno)
 */
-static int msg_add_element(struct ldb_message *msg, struct ldb_message_element *el)
+static int msg_add_element(struct ldb_context *ldb,
+                          struct ldb_message *msg, struct ldb_message_element *el)
 {
        struct ldb_message_element *e2;
-       int i;
+       unsigned int i;
 
-       e2 = realloc_p(msg->elements, struct ldb_message_element, 
-                      msg->num_elements+1);
+       e2 = talloc_realloc(msg, msg->elements, struct ldb_message_element, 
+                             msg->num_elements+1);
        if (!e2) {
                errno = ENOMEM;
                return -1;
@@ -346,9 +483,8 @@ static int msg_add_element(struct ldb_message *msg, struct ldb_message_element *
        e2->flags = el->flags;
        e2->values = NULL;
        if (el->num_values != 0) {
-               e2->values = malloc_array_p(struct ldb_val, el->num_values);
+               e2->values = talloc_array(msg->elements, struct ldb_val, el->num_values);
                if (!e2->values) {
-                       free(e2->name);
                        errno = ENOMEM;
                        return -1;
                }
@@ -366,29 +502,39 @@ static int msg_add_element(struct ldb_message *msg, struct ldb_message_element *
 /*
   delete all elements having a specified attribute name
 */
-static int msg_delete_attribute(struct ldb_message *msg, const char *name)
+static int msg_delete_attribute(struct ldb_module *module,
+                               struct ldb_context *ldb,
+                               struct ldb_message *msg, const char *name)
 {
-       int i, count=0;
-       struct ldb_message_element *el2;
+       char *dn;
+       unsigned int i, j;
 
-       el2 = malloc_array_p(struct ldb_message_element, msg->num_elements);
-       if (!el2) {
-               errno = ENOMEM;
+       dn = ldb_dn_linearize(ldb, msg->dn);
+       if (dn == NULL) {
                return -1;
        }
 
        for (i=0;i<msg->num_elements;i++) {
-               if (ldb_attr_cmp(msg->elements[i].name, name) != 0) {
-                       el2[count++] = msg->elements[i];
-               } else {
-                       if (msg->elements[i].values) free(msg->elements[i].values);
+               if (ldb_attr_cmp(msg->elements[i].name, name) == 0) {
+                       for (j=0;j<msg->elements[i].num_values;j++) {
+                               ltdb_index_del_value(module, dn, &msg->elements[i], j);
+                       }
+                       talloc_free(msg->elements[i].values);
+                       if (msg->num_elements > (i+1)) {
+                               memmove(&msg->elements[i], 
+                                       &msg->elements[i+1], 
+                                       sizeof(struct ldb_message_element)*
+                                       (msg->num_elements - (i+1)));
+                       }
+                       msg->num_elements--;
+                       i--;
+                       msg->elements = talloc_realloc(msg, msg->elements, 
+                                                        struct ldb_message_element, 
+                                                        msg->num_elements);
                }
        }
 
-       msg->num_elements = count;
-       if (msg->elements) free(msg->elements);
-       msg->elements = el2;
-
+       talloc_free(dn);
        return 0;
 }
 
@@ -397,32 +543,40 @@ static int msg_delete_attribute(struct ldb_message *msg, const char *name)
 
   return 0 on success, -1 on failure
 */
-static int msg_delete_element(struct ldb_context *ldb,
+static int msg_delete_element(struct ldb_module *module,
                              struct ldb_message *msg, 
                              const char *name,
                              const struct ldb_val *val)
 {
-       int i;
+       struct ldb_context *ldb = module->ldb;
+       unsigned int i;
+       int found;
        struct ldb_message_element *el;
+       const struct ldb_attrib_handler *h;
 
-       i = find_element(msg, name);
-       if (i == -1) {
+       found = find_element(msg, name);
+       if (found == -1) {
                return -1;
        }
 
-       el = &msg->elements[i];
+       el = &msg->elements[found];
+
+       h = ldb_attrib_handler(ldb, el->name);
 
        for (i=0;i<el->num_values;i++) {
-               if (ldb_val_equal(ldb, msg->elements[i].name, &el->values[i], val)) {
+               if (h->comparison_fn(ldb, ldb, &el->values[i], val) == 0) {
                        if (i<el->num_values-1) {
                                memmove(&el->values[i], &el->values[i+1],
-                                       sizeof(el->values[i])*el->num_values-(i+1));
+                                       sizeof(el->values[i])*(el->num_values-(i+1)));
                        }
                        el->num_values--;
+                       if (el->num_values == 0) {
+                               return msg_delete_attribute(module, ldb, msg, name);
+                       }
                        return 0;
                }
        }
-       
+
        return -1;
 }
 
@@ -434,187 +588,445 @@ static int msg_delete_element(struct ldb_context *ldb,
   get away with it, but if we ever have really large attribute lists 
   then we'll need to look at this again
 */
-int ltdb_modify_internal(struct ldb_context *ldb, const struct ldb_message *msg)
+int ltdb_modify_internal(struct ldb_module *module, const struct ldb_message *msg)
 {
-       struct ltdb_private *ltdb = ldb->private_data;
+       struct ldb_context *ldb = module->ldb;
+       struct ltdb_private *ltdb =
+               talloc_get_type(module->private_data, struct ltdb_private);
        TDB_DATA tdb_key, tdb_data;
-       struct ldb_message msg2;
-       int ret, i, j;
+       struct ldb_message *msg2;
+       unsigned i, j;
+       int ret;
 
-       tdb_key = ltdb_key(ldb, msg->dn);
+       tdb_key = ltdb_key(module, msg->dn);
        if (!tdb_key.dptr) {
-               return -1;
+               return LDB_ERR_OTHER;
        }
 
        tdb_data = tdb_fetch(ltdb->tdb, tdb_key);
        if (!tdb_data.dptr) {
-               free(tdb_key.dptr);
-               return -1;
+               talloc_free(tdb_key.dptr);
+               return ltdb_err_map(tdb_error(ltdb->tdb));
+       }
+
+       msg2 = talloc(tdb_key.dptr, struct ldb_message);
+       if (msg2 == NULL) {
+               talloc_free(tdb_key.dptr);
+               return LDB_ERR_OTHER;
        }
 
-       ret = ltdb_unpack_data(ldb, &tdb_data, &msg2);
+       ret = ltdb_unpack_data(module, &tdb_data, msg2);
        if (ret == -1) {
-               free(tdb_key.dptr);
-               free(tdb_data.dptr);
-               return -1;
+               ret = LDB_ERR_OTHER;
+               goto failed;
        }
 
-       if (!msg2.dn) {
-               msg2.dn = msg->dn;
+       if (!msg2->dn) {
+               msg2->dn = msg->dn;
        }
 
        for (i=0;i<msg->num_elements;i++) {
+               struct ldb_message_element *el = &msg->elements[i];
+               struct ldb_message_element *el2;
+               struct ldb_val *vals;
+               char *dn;
+
                switch (msg->elements[i].flags & LDB_FLAG_MOD_MASK) {
 
                case LDB_FLAG_MOD_ADD:
                        /* add this element to the message. fail if it
                           already exists */
-                       ret = find_element(&msg2, msg->elements[i].name);
-                       if (ret != -1) {
-                               errno = EEXIST;
-                               goto failed;
+                       ret = find_element(msg2, el->name);
+
+                       if (ret == -1) {
+                               if (msg_add_element(ldb, msg2, el) != 0) {
+                                       ret = LDB_ERR_OTHER;
+                                       goto failed;
+                               }
+                               continue;
+                       }
+
+                       el2 = &msg2->elements[ret];
+
+                       /* An attribute with this name already exists, add all
+                        * values if they don't already exist. */
+
+                       for (j=0;j<el->num_values;j++) {
+                               if (ldb_msg_find_val(el2, &el->values[j])) {
+                                       ldb_set_errstring(module->ldb, "Type or value exists");
+                                       ret = LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS;
+                                       goto failed;
+                               }
                        }
-                       if (msg_add_element(&msg2, &msg->elements[i]) != 0) {
+
+                       vals = talloc_realloc(msg2->elements, el2->values, struct ldb_val,
+                                               el2->num_values + el->num_values);
+
+                       if (vals == NULL) {
+                               ret = LDB_ERR_OTHER;
                                goto failed;
                        }
+
+                       for (j=0;j<el->num_values;j++) {
+                               vals[el2->num_values + j] =
+                                       ldb_val_dup(vals, &el->values[j]);
+                       }
+
+                       el2->values = vals;
+                       el2->num_values += el->num_values;
+
                        break;
 
                case LDB_FLAG_MOD_REPLACE:
                        /* replace all elements of this attribute name with the elements
-                          listed */
-                       if (msg_delete_attribute(&msg2, msg->elements[i].name) != 0) {
-                               goto failed;
-                       }
-                       /* add the replacement element */
-                       if (msg_add_element(&msg2, &msg->elements[i]) != 0) {
+                          listed. The attribute not existing is not an error */
+                       msg_delete_attribute(module, ldb, msg2, msg->elements[i].name);
+
+                       /* add the replacement element, if not empty */
+                       if (msg->elements[i].num_values != 0 &&
+                           msg_add_element(ldb, msg2, &msg->elements[i]) != 0) {
+                               ret = LDB_ERR_OTHER;
                                goto failed;
                        }
                        break;
 
                case LDB_FLAG_MOD_DELETE:
+
+                       dn = ldb_dn_linearize(msg2, msg->dn);
+                       if (dn == NULL) {
+                               ret = LDB_ERR_OTHER;
+                               goto failed;
+                       }
+
                        /* we could be being asked to delete all
                           values or just some values */
                        if (msg->elements[i].num_values == 0) {
-                               if (msg_delete_attribute(&msg2, 
-                                                         msg->elements[i].name) != 0) {
+                               if (msg_delete_attribute(module, ldb, msg2, 
+                                                        msg->elements[i].name) != 0) {
+                                       ldb_asprintf_errstring(module->ldb, "No such attribute: %s for delete on %s", msg->elements[i].name, dn);
+                                       ret = LDB_ERR_NO_SUCH_ATTRIBUTE;
                                        goto failed;
                                }
                                break;
                        }
                        for (j=0;j<msg->elements[i].num_values;j++) {
-                               if (msg_delete_element(ldb,
-                                                      &msg2, 
+                               if (msg_delete_element(module,
+                                                      msg2, 
                                                       msg->elements[i].name,
                                                       &msg->elements[i].values[j]) != 0) {
+                                       ldb_asprintf_errstring(module->ldb, "No matching attribute value when deleting attribute: %s on %s", msg->elements[i].name, dn);
+                                       ret = LDB_ERR_NO_SUCH_ATTRIBUTE;
+                                       goto failed;
+                               }
+                               if (ltdb_index_del_value(module, dn, &msg->elements[i], j) != 0) {
+                                       ret = LDB_ERR_OTHER;
                                        goto failed;
                                }
                        }
                        break;
+               default:
+                       ldb_asprintf_errstring(module->ldb, "Invalid ldb_modify flags on %s: 0x%x", 
+                                                            msg->elements[i].name, 
+                                                            msg->elements[i].flags & LDB_FLAG_MOD_MASK);
+                       ret = LDB_ERR_PROTOCOL_ERROR;
+                       goto failed;
                }
        }
 
        /* we've made all the mods - save the modified record back into the database */
-       ret = ltdb_store(ldb, &msg2, TDB_MODIFY);
+       ret = ltdb_store(module, msg2, TDB_MODIFY);
+       if (ret != LDB_SUCCESS) {
+               goto failed;
+       }
+
+       if (ltdb_modified(module, msg->dn) != LDB_SUCCESS) {
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto failed;
+       }
 
-       free(tdb_key.dptr);
+       talloc_free(tdb_key.dptr);
        free(tdb_data.dptr);
-       ltdb_unpack_data_free(&msg2);
        return ret;
 
 failed:
-       free(tdb_key.dptr);
+       talloc_free(tdb_key.dptr);
        free(tdb_data.dptr);
-       ltdb_unpack_data_free(&msg2);
-       return -1;
+       return ret;
 }
 
 /*
   modify a record
 */
-static int ltdb_modify(struct ldb_context *ldb, const struct ldb_message *msg)
+static int ltdb_modify(struct ldb_module *module, struct ldb_request *req)
 {
-       int ret;
-
-       if (ltdb_lock(ldb) != 0) {
-               return -1;
+       struct ltdb_private *ltdb = talloc_get_type(module->private_data, struct ltdb_private);
+       struct ltdb_context *ltdb_ac;
+       int tret, ret = LDB_SUCCESS;
+
+       if (req->controls != NULL) {
+               ldb_debug(module->ldb, LDB_DEBUG_WARNING, "Controls should not reach the ldb_tdb backend!\n");
+               if (check_critical_controls(req->controls)) {
+                       return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION;
+               }
        }
+       
+       req->handle = NULL;
 
-       if (ltdb_cache_load(ldb) != 0) {
-               ltdb_unlock(ldb);
-               return -1;
+       req->handle = init_ltdb_handle(ltdb, module, req);
+       if (req->handle == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
        }
+       ltdb_ac = talloc_get_type(req->handle->private_data, struct ltdb_context);
 
-       ret = ltdb_modify_internal(ldb, msg);
-
-       if (ret == 0) {
-               ltdb_modified(ldb, msg->dn);
+       tret = ltdb_check_special_dn(module, req->op.mod.message);
+       if (tret != LDB_SUCCESS) {
+               req->handle->status = tret;
+               goto done;
+       }
+       
+       if (ltdb_cache_load(module) != 0) {
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto done;
        }
 
-       ltdb_unlock(ldb);
+       tret = ltdb_modify_internal(module, req->op.mod.message);
+       if (tret != LDB_SUCCESS) {
+               req->handle->status = tret;
+               goto done;
+       }
 
+       if (ltdb_ac->callback) {
+               ret = ltdb_ac->callback(module->ldb, ltdb_ac->context, NULL);
+       }
+done:
+       req->handle->state = LDB_ASYNC_DONE;
        return ret;
 }
 
 /*
-  close database
+  rename a record
 */
-static int ltdb_close(struct ldb_context *ldb)
+static int ltdb_rename(struct ldb_module *module, struct ldb_request *req)
 {
-       struct ltdb_private *ltdb = ldb->private_data;
-       int ret;
+       struct ltdb_private *ltdb = talloc_get_type(module->private_data, struct ltdb_private);
+       struct ltdb_context *ltdb_ac;
+       struct ldb_message *msg;
+       int tret, ret = LDB_SUCCESS;
+
+       if (req->controls != NULL) {
+               ldb_debug(module->ldb, LDB_DEBUG_WARNING, "Controls should not reach the ldb_tdb backend!\n");
+               if (check_critical_controls(req->controls)) {
+                       return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION;
+               }
+       }
+       
+       req->handle = NULL;
+
+       if (ltdb_cache_load(module) != 0) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       req->handle = init_ltdb_handle(ltdb, module, req);
+       if (req->handle == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+       ltdb_ac = talloc_get_type(req->handle->private_data, struct ltdb_context);
+
+       msg = talloc(ltdb_ac, struct ldb_message);
+       if (msg == NULL) {
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto done;
+       }
+
+       /* in case any attribute of the message was indexed, we need
+          to fetch the old record */
+       tret = ltdb_search_dn1(module, req->op.rename.olddn, msg);
+       if (tret != 1) {
+               /* not finding the old record is an error */
+               req->handle->status = LDB_ERR_NO_SUCH_OBJECT;
+               goto done;
+       }
+
+       msg->dn = ldb_dn_copy(msg, req->op.rename.newdn);
+       if (!msg->dn) {
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto done;
+       }
 
-       ltdb_cache_free(ldb);
+       tret = ltdb_add_internal(module, msg);
+       if (tret != LDB_SUCCESS) {
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto done;
+       }
+
+       tret = ltdb_delete_internal(module, req->op.rename.olddn);
+       if (tret != LDB_SUCCESS) {
+               ltdb_delete_internal(module, req->op.rename.newdn);
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto done;
+       }
 
-       ret = tdb_close(ltdb->tdb);
-       free(ltdb);
-       free(ldb);
+       if (ltdb_ac->callback) {
+               ret = ltdb_ac->callback(module->ldb, ltdb_ac->context, NULL);
+       }
+done:
+       req->handle->state = LDB_ASYNC_DONE;
        return ret;
 }
-                     
+
+static int ltdb_start_trans(struct ldb_module *module)
+{
+       struct ltdb_private *ltdb =
+               talloc_get_type(module->private_data, struct ltdb_private);
+
+       if (tdb_transaction_start(ltdb->tdb) != 0) {
+               return ltdb_err_map(tdb_error(ltdb->tdb));
+       }
+
+       return LDB_SUCCESS;
+}
+
+static int ltdb_end_trans(struct ldb_module *module)
+{
+       struct ltdb_private *ltdb =
+               talloc_get_type(module->private_data, struct ltdb_private);
+
+       if (tdb_transaction_commit(ltdb->tdb) != 0) {
+               return ltdb_err_map(tdb_error(ltdb->tdb));
+       }
+
+       return LDB_SUCCESS;
+}
+
+static int ltdb_del_trans(struct ldb_module *module)
+{
+       struct ltdb_private *ltdb =
+               talloc_get_type(module->private_data, struct ltdb_private);
+
+       if (tdb_transaction_cancel(ltdb->tdb) != 0) {
+               return ltdb_err_map(tdb_error(ltdb->tdb));
+       }
+
+       return LDB_SUCCESS;
+}
+
+static int ltdb_wait(struct ldb_handle *handle, enum ldb_wait_type type)
+{
+       return handle->status;
+}
+
+static int ltdb_request(struct ldb_module *module, struct ldb_request *req)
+{
+       /* check for oustanding critical controls and return an error if found */
+       if (req->controls != NULL) {
+               ldb_debug(module->ldb, LDB_DEBUG_WARNING, "Controls should not reach the ldb_tdb backend!\n");
+               if (check_critical_controls(req->controls)) {
+                       return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION;
+               }
+       }
+       
+       /* search, add, modify, delete, rename are handled by their own, no other op supported */
+       return LDB_ERR_OPERATIONS_ERROR;
+}
 
 /*
-  return extended error information
+  return sequenceNumber from @BASEINFO
 */
-static const char *ltdb_errstring(struct ldb_context *ldb)
+static int ltdb_sequence_number(struct ldb_module *module, struct ldb_request *req)
 {
-       struct ltdb_private *ltdb = ldb->private_data;
-       return tdb_errorstr(ltdb->tdb);
-}
+       TALLOC_CTX *tmp_ctx = talloc_new(req);
+       struct ldb_message *msg = NULL;
+       struct ldb_dn *dn = ldb_dn_explode(tmp_ctx, LTDB_BASEINFO);
+       int tret;
+
+       if (tmp_ctx == NULL) {
+               talloc_free(tmp_ctx);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
 
+       msg = talloc(tmp_ctx, struct ldb_message);
+       if (msg == NULL) {
+               talloc_free(tmp_ctx);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
 
-static const struct ldb_backend_ops ltdb_ops = {
-       ltdb_close, 
-       ltdb_search,
-       ltdb_search_free,
-       ltdb_add,
-       ltdb_modify,
-       ltdb_delete,
-       ltdb_errstring
-};
+       req->op.seq_num.flags = 0;
+
+       tret = ltdb_search_dn1(module, dn, msg);
+       if (tret != 1) {
+               talloc_free(tmp_ctx);
+               req->op.seq_num.seq_num = 0;
+               /* zero is as good as anything when we don't know */
+               return LDB_SUCCESS;
+       }
+
+       switch (req->op.seq_num.type) {
+       case LDB_SEQ_HIGHEST_SEQ:
+               req->op.seq_num.seq_num = ldb_msg_find_attr_as_uint64(msg, LTDB_SEQUENCE_NUMBER, 0);
+               break;
+       case LDB_SEQ_NEXT:
+               req->op.seq_num.seq_num = ldb_msg_find_attr_as_uint64(msg, LTDB_SEQUENCE_NUMBER, 0);
+               req->op.seq_num.seq_num++;
+               break;
+       case LDB_SEQ_HIGHEST_TIMESTAMP:
+       {
+               const char *date = ldb_msg_find_attr_as_string(msg, LTDB_MOD_TIMESTAMP, NULL);
+               if (date) {
+                       req->op.seq_num.seq_num = ldb_string_to_time(date);
+               } else {
+                       req->op.seq_num.seq_num = 0;
+                       /* zero is as good as anything when we don't know */
+               }
+               break;
+       }
+       }
+       talloc_free(tmp_ctx);
+       return LDB_SUCCESS;
+}
 
+static const struct ldb_module_ops ltdb_ops = {
+       .name              = "tdb",
+       .search            = ltdb_search,
+       .add               = ltdb_add,
+       .modify            = ltdb_modify,
+       .del               = ltdb_delete,
+       .rename            = ltdb_rename,
+       .request           = ltdb_request,
+       .start_transaction = ltdb_start_trans,
+       .end_transaction   = ltdb_end_trans,
+       .del_transaction   = ltdb_del_trans,
+       .wait              = ltdb_wait,
+       .sequence_number   = ltdb_sequence_number
+};
 
 /*
   connect to the database
 */
-struct ldb_context *ltdb_connect(const char *url, 
-                                unsigned int flags, 
-                                const char *options[])
+static int ltdb_connect(struct ldb_context *ldb, const char *url, 
+                       unsigned int flags, const char *options[],
+                       struct ldb_module **module)
 {
        const char *path;
        int tdb_flags, open_flags;
        struct ltdb_private *ltdb;
-       TDB_CONTEXT *tdb;
-       struct ldb_context *ldb;
 
        /* parse the url */
-       if (strncmp(url, "tdb://", 6) != 0) {
-               errno = EINVAL;
-               return NULL;
+       if (strchr(url, ':')) {
+               if (strncmp(url, "tdb://", 6) != 0) {
+                       ldb_debug(ldb, LDB_DEBUG_ERROR, "Invalid tdb URL '%s'", url);
+                       return -1;
+               }
+               path = url+6;
+       } else {
+               path = url;
        }
 
-       path = url+6;
+       tdb_flags = TDB_DEFAULT | TDB_SEQNUM;
 
-       tdb_flags = TDB_DEFAULT;
+       /* check for the 'nosync' option */
+       if (flags & LDB_FLG_NOSYNC) {
+               tdb_flags |= TDB_NOSYNC;
+       }
 
        if (flags & LDB_FLG_RDONLY) {
                open_flags = O_RDONLY;
@@ -622,34 +1034,46 @@ struct ldb_context *ltdb_connect(const char *url,
                open_flags = O_CREAT | O_RDWR;
        }
 
-       /* note that we use quite a large default hash size */
-       tdb = tdb_open(path, 10000, tdb_flags, open_flags, 0666);
-       if (!tdb) {
-               return NULL;
+       ltdb = talloc_zero(ldb, struct ltdb_private);
+       if (!ltdb) {
+               ldb_oom(ldb);
+               return -1;
        }
 
-       ltdb = malloc_p(struct ltdb_private);
-       if (!ltdb) {
-               tdb_close(tdb);
-               errno = ENOMEM;
-               return NULL;
+       /* note that we use quite a large default hash size */
+       ltdb->tdb = ltdb_wrap_open(ltdb, path, 10000, 
+                                  tdb_flags, open_flags, 
+                                  ldb->create_perms, ldb);
+       if (!ltdb->tdb) {
+               ldb_debug(ldb, LDB_DEBUG_ERROR, "Unable to open tdb '%s'\n", path);
+               talloc_free(ltdb);
+               return -1;
        }
 
-       ltdb->tdb = tdb;
        ltdb->sequence_number = 0;
 
-       memset(&ltdb->cache, 0, sizeof(ltdb->cache));
-
-       ldb = malloc_p(struct ldb_context);
-       if (!ldb) {
-               tdb_close(tdb);
-               free(ltdb);
-               errno = ENOMEM;
-               return NULL;
+       *module = talloc(ldb, struct ldb_module);
+       if (!module) {
+               ldb_oom(ldb);
+               talloc_free(ltdb);
+               return -1;
+       }
+       talloc_set_name_const(*module, "ldb_tdb backend");
+       (*module)->ldb = ldb;
+       (*module)->prev = (*module)->next = NULL;
+       (*module)->private_data = ltdb;
+       (*module)->ops = &ltdb_ops;
+
+       if (ltdb_cache_load(*module) != 0) {
+               talloc_free(*module);
+               talloc_free(ltdb);
+               return -1;
        }
 
-       ldb->private_data = ltdb;
-       ldb->ops = &ltdb_ops;
+       return 0;
+}
 
-       return ldb;
+int ldb_tdb_init(void)
+{
+       return ldb_register_backend("tdb", ltdb_connect);
 }