s4:samldb: make use of dom_sid_split_rid()
[kai/samba.git] / source4 / dsdb / samdb / ldb_modules / samldb.c
index c62c7dcf71425338451358e0fa0e4569f12f62f4..7ecc41d2c3682579bde84e6fed824342c36f1caf 100644 (file)
@@ -1,26 +1,25 @@
-/* 
+/*
    SAM ldb module
 
-   Copyright (C) Simo Sorce  2004
    Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005
+   Copyright (C) Simo Sorce  2004-2008
 
    * NOTICE: this module is NOT released under the GNU LGPL license as
-   * other ldb code. This module is release under the GNU GPL v2 or
+   * other ldb code. This module is release under the GNU GPL v3 or
    * later license.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
  */
 
 #include "includes.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/ldap_ndr.h"
 #include "lib/ldb/include/ldb_errors.h"
+#include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_private.h"
+#include "lib/events/events.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "db_wrap.h"
+#include "../lib/util/util_ldb.h"
+#include "ldb_wrap.h"
+
+struct samldb_ctx;
+
+typedef int (*samldb_step_fn_t)(struct samldb_ctx *);
+
+struct samldb_step {
+       struct samldb_step *next;
+       samldb_step_fn_t fn;
+};
+
+struct samldb_ctx {
+       struct ldb_module *module;
+       struct ldb_request *req;
 
-int samldb_notice_sid(struct ldb_module *module, 
-                     TALLOC_CTX *mem_ctx, const struct dom_sid *sid);
+       /* the resulting message */
+       struct ldb_message *msg;
 
-static BOOL samldb_msg_add_sid(struct ldb_module *module, struct ldb_message *msg, const char *name, const struct dom_sid *sid)
+       /* used to apply templates */
+       const char *type;
+
+       /* used to find parent domain */
+       struct ldb_dn *check_dn;
+       struct ldb_dn *domain_dn;
+       struct dom_sid *domain_sid;
+       uint32_t next_rid;
+
+       /* generic storage, remember to zero it before use */
+       struct ldb_reply *ares;
+
+       /* holds the entry SID */
+       struct dom_sid *sid;
+
+       /* all the async steps necessary to complete the operation */
+       struct samldb_step *steps;
+       struct samldb_step *curstep;
+};
+
+static struct samldb_ctx *samldb_ctx_init(struct ldb_module *module,
+                                         struct ldb_request *req)
 {
-       struct ldb_val v;
-       NTSTATUS status;
-       status = ndr_push_struct_blob(&v, msg, sid, 
-                                     (ndr_push_flags_fn_t)ndr_push_dom_sid);
-       if (!NT_STATUS_IS_OK(status)) {
-               return -1;
+       struct samldb_ctx *ac;
+
+       ac = talloc_zero(req, struct samldb_ctx);
+       if (ac == NULL) {
+               ldb_oom(module->ldb);
+               return NULL;
        }
-       return (ldb_msg_add_value(msg, name, &v, NULL) == 0);
+
+       ac->module = module;
+       ac->req = req;
+
+       return ac;
 }
 
-/*
-  allocate a new id, attempting to do it atomically
-  return 0 on failure, the id on success
-*/
-static int samldb_set_next_rid(struct ldb_context *ldb, TALLOC_CTX *mem_ctx,
-                              struct ldb_dn *dn, uint32_t old_id, uint32_t new_id)
+static int samldb_add_step(struct samldb_ctx *ac, samldb_step_fn_t fn)
 {
-       struct ldb_message msg;
-       int ret;
-       struct ldb_val vals[2];
-       struct ldb_message_element els[2];
+       struct samldb_step *step;
 
-       if (new_id == 0) {
-               /* out of IDs ! */
-               ldb_debug(ldb, LDB_DEBUG_FATAL, "Are we out of valid IDs ?\n");
+       step = talloc_zero(ac, struct samldb_step);
+       if (step == NULL) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       /* we do a delete and add as a single operation. That prevents
-          a race, in case we are not actually on a transaction db */
-       ZERO_STRUCT(msg);
-       msg.dn = ldb_dn_copy(mem_ctx, dn);
-       if (!msg.dn) {
-               return LDB_ERR_OPERATIONS_ERROR;
+       if (ac->steps == NULL) {
+               ac->steps = step;
+               ac->curstep = step;
+       } else {
+               ac->curstep->next = step;
+               ac->curstep = step;
        }
-       msg.num_elements = 2;
-       msg.elements = els;
 
-       els[0].num_values = 1;
-       els[0].values = &vals[0];
-       els[0].flags = LDB_FLAG_MOD_DELETE;
-       els[0].name = talloc_strdup(mem_ctx, "nextRid");
-       if (!els[0].name) {
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
+       step->fn = fn;
 
-       els[1].num_values = 1;
-       els[1].values = &vals[1];
-       els[1].flags = LDB_FLAG_MOD_ADD;
-       els[1].name = els[0].name;
+       return LDB_SUCCESS;
+}
 
-       vals[0].data = (uint8_t *)talloc_asprintf(mem_ctx, "%u", old_id);
-       if (!vals[0].data) {
+static int samldb_first_step(struct samldb_ctx *ac)
+{
+       if (ac->steps == NULL) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
-       vals[0].length = strlen((char *)vals[0].data);
 
-       vals[1].data = (uint8_t *)talloc_asprintf(mem_ctx, "%u", new_id);
-       if (!vals[1].data) {
-               return LDB_ERR_OPERATIONS_ERROR;
+       ac->curstep = ac->steps;
+       return ac->curstep->fn(ac);
+}
+
+static int samldb_next_step(struct samldb_ctx *ac)
+{
+       if (ac->curstep->next) {
+               ac->curstep = ac->curstep->next;
+               return ac->curstep->fn(ac);
        }
-       vals[1].length = strlen((char *)vals[1].data);
 
-       ret = ldb_modify(ldb, &msg);
-       return ret;
+       /* it is an error if the last step does not properly
+        * return to the upper module by itself */
+       return LDB_ERR_OPERATIONS_ERROR;
 }
 
-/*
-  allocate a new id, attempting to do it atomically
-  return 0 on failure, the id on success
-*/
-static int samldb_find_next_rid(struct ldb_module *module, TALLOC_CTX *mem_ctx,
-                               struct ldb_dn *dn, uint32_t *old_rid)
+static int samldb_search_template_callback(struct ldb_request *req,
+                                          struct ldb_reply *ares)
 {
-       const char * const attrs[2] = { "nextRid", NULL };
-       struct ldb_result *res = NULL;
+       struct samldb_ctx *ac;
        int ret;
-       const char *str;
 
-       ret = ldb_search(module->ldb, dn, LDB_SCOPE_BASE, "nextRid=*", attrs, &res);
-       if (ret != LDB_SUCCESS) {
-               return ret;
+       ac = talloc_get_type(req->context, struct samldb_ctx);
+
+       if (!ares) {
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto done;
        }
-       if (res->count != 1) {
-               talloc_free(res);
-               return LDB_ERR_OPERATIONS_ERROR;
+       if (ares->error != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, ares->controls,
+                                       ares->response, ares->error);
        }
 
-       str = ldb_msg_find_attr_as_string(res->msgs[0], "nextRid", NULL);
-       if (str == NULL) {
-               ldb_asprintf_errstring(module->ldb,
-                                       "attribute nextRid not found in %s\n",
-                                       ldb_dn_get_linearized(dn));
-               talloc_free(res);
-               return LDB_ERR_OPERATIONS_ERROR;
+       switch (ares->type) {
+       case LDB_REPLY_ENTRY:
+               /* save entry */
+               if (ac->ares != NULL) {
+                       /* one too many! */
+                       ldb_set_errstring(ac->module->ldb,
+                               "Invalid number of results while searching "
+                               "for template objects");
+                       ret = LDB_ERR_OPERATIONS_ERROR;
+                       goto done;
+               }
+
+               ac->ares = talloc_steal(ac, ares);
+               ret = LDB_SUCCESS;
+               break;
+
+       case LDB_REPLY_REFERRAL:
+               /* ignore */
+               talloc_free(ares);
+               ret = LDB_SUCCESS;
+               break;
+
+       case LDB_REPLY_DONE:
+
+               talloc_free(ares);
+               ret = samldb_next_step(ac);
+               break;
+       }
+
+done:
+       if (ret != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, NULL, NULL, ret);
        }
 
-       *old_rid = strtol(str, NULL, 0);
-       talloc_free(res);
        return LDB_SUCCESS;
 }
 
-static int samldb_allocate_next_rid(struct ldb_module *module, TALLOC_CTX *mem_ctx,
-                                   struct ldb_dn *dn, const struct dom_sid *dom_sid, 
-                                   struct dom_sid **new_sid)
+static int samldb_search_template(struct samldb_ctx *ac)
 {
-       struct dom_sid *obj_sid;
-       uint32_t old_rid;
+       struct event_context *ev;
+       struct loadparm_context *lparm_ctx;
+       struct ldb_context *templates_ldb;
+       char *templates_ldb_path;
+       struct ldb_request *req;
+       struct ldb_dn *basedn;
+       void *opaque;
        int ret;
-       
-       ret = samldb_find_next_rid(module, mem_ctx, dn, &old_rid);      
-       if (ret) {
-               return ret;
+
+       opaque = ldb_get_opaque(ac->module->ldb, "loadparm");
+       lparm_ctx = talloc_get_type(opaque, struct loadparm_context);
+       if (lparm_ctx == NULL) {
+               ldb_set_errstring(ac->module->ldb,
+                       "Unable to find loadparm context\n");
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       opaque = ldb_get_opaque(ac->module->ldb, "templates_ldb");
+       templates_ldb = talloc_get_type(opaque, struct ldb_context);
+
+       /* make sure we have the templates ldb */
+       if (!templates_ldb) {
+               templates_ldb_path = samdb_relative_path(ac->module->ldb, ac,
+                                                        "templates.ldb");
+               if (!templates_ldb_path) {
+                       ldb_set_errstring(ac->module->ldb,
+                                       "samldb_init_template: ERROR: Failed "
+                                       "to contruct path for template db");
+                       return LDB_ERR_OPERATIONS_ERROR;
+               }
+
+               ev = ldb_get_event_context(ac->module->ldb);
+
+               templates_ldb = ldb_wrap_connect(ac->module->ldb, ev,
+                                               lparm_ctx, templates_ldb_path,
+                                               NULL, NULL, 0, NULL);
+               talloc_free(templates_ldb_path);
+
+               if (!templates_ldb) {
+                       return LDB_ERR_OPERATIONS_ERROR;
+               }
+
+               if (!talloc_reference(templates_ldb, ev)) {
+                       return LDB_ERR_OPERATIONS_ERROR;
+               }
+
+               ret = ldb_set_opaque(ac->module->ldb,
+                                       "templates_ldb", templates_ldb);
+               if (ret != LDB_SUCCESS) {
+                       return ret;
+               }
        }
-               
-       /* return the new object sid */
-       obj_sid = dom_sid_add_rid(mem_ctx, dom_sid, old_rid);
-               
-       *new_sid = dom_sid_add_rid(mem_ctx, dom_sid, old_rid + 1);
-       if (!*new_sid) {
+
+       /* search template */
+       basedn = ldb_dn_new_fmt(ac, templates_ldb,
+                           "cn=Template%s,cn=Templates", ac->type);
+       if (basedn == NULL) {
+               ldb_set_errstring(ac->module->ldb,
+                       "samldb_init_template: ERROR: Failed "
+                       "to contruct DN for template");
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       ret = samldb_notice_sid(module, mem_ctx, *new_sid);
-       if (ret != 0) {
-               /* gah, there are conflicting sids.
-                * This is a critical situation it means that someone messed up with
-                * the DB and nextRid is not returning free RIDs, report an error
-                * and refuse to create any user until the problem is fixed */
-               ldb_asprintf_errstring(module->ldb,
-                                       "Critical Error: unconsistent DB, unable to retireve an unique RID to generate a new SID: %s",
-                                       ldb_errstring(module->ldb));
+       /* pull the template record */
+       ret = ldb_build_search_req(&req, templates_ldb, ac,
+                                  basedn, LDB_SCOPE_BASE,
+                                 "(distinguishedName=*)", NULL,
+                                 NULL,
+                                 ac, samldb_search_template_callback,
+                                 ac->req);
+       if (ret != LDB_SUCCESS) {
                return ret;
        }
-       return ret;
+
+       talloc_steal(req, basedn);
+       ac->ares = NULL;
+
+       return ldb_request(templates_ldb, req);
 }
 
-/* Find a domain object in the parents of a particular DN.  */
-static struct ldb_dn *samldb_search_domain(struct ldb_module *module, TALLOC_CTX *mem_ctx, struct ldb_dn *dn)
+static int samldb_apply_template(struct samldb_ctx *ac)
 {
-       TALLOC_CTX *local_ctx;
-       struct ldb_dn *sdn;
-       struct ldb_result *res = NULL;
-       int ret = 0;
-       const char *attrs[] = { NULL };
-
-       local_ctx = talloc_new(mem_ctx);
-       if (local_ctx == NULL) return NULL;
-
-       sdn = ldb_dn_copy(local_ctx, dn);
-       do {
-               ret = ldb_search(module->ldb, sdn, LDB_SCOPE_BASE, 
-                                "(|(objectClass=domain)(objectClass=builtinDomain))", attrs, &res);
-               if (ret == LDB_SUCCESS) {
-                       talloc_steal(local_ctx, res);
-                       if (res->count == 1) {
-                               break;
+       struct ldb_message_element *el;
+       struct ldb_message *msg;
+       int i, j;
+       int ret;
+
+       msg = ac->ares->message;
+
+       for (i = 0; i < msg->num_elements; i++) {
+               el = &msg->elements[i];
+               /* some elements should not be copied */
+               if (ldb_attr_cmp(el->name, "cn") == 0 ||
+                   ldb_attr_cmp(el->name, "name") == 0 ||
+                   ldb_attr_cmp(el->name, "objectClass") == 0 ||
+                   ldb_attr_cmp(el->name, "sAMAccountName") == 0 ||
+                   ldb_attr_cmp(el->name, "sAMAccountName") == 0 ||
+                   ldb_attr_cmp(el->name, "distinguishedName") == 0 ||
+                   ldb_attr_cmp(el->name, "objectGUID") == 0) {
+                       continue;
+               }
+               for (j = 0; j < el->num_values; j++) {
+                       ret = samdb_find_or_add_attribute(
+                                       ac->module->ldb, ac->msg, el->name,
+                                       (char *)el->values[j].data);
+                       if (ret != LDB_SUCCESS) {
+                               ldb_set_errstring(ac->module->ldb,
+                                         "Failed adding template attribute\n");
+                               return LDB_ERR_OPERATIONS_ERROR;
                        }
                }
-       } while ((sdn = ldb_dn_get_parent(local_ctx, sdn)));
-
-       if (ret != LDB_SUCCESS || res->count != 1) {
-               talloc_free(local_ctx);
-               return NULL;
        }
 
-       talloc_steal(mem_ctx, sdn);
-       talloc_free(local_ctx);
-
-       return sdn;
+       return samldb_next_step(ac);
 }
 
-/* search the domain related to the provided dn
-   allocate a new RID for the domain
-   return the new sid string
-*/
-static int samldb_get_new_sid(struct ldb_module *module, 
-                             TALLOC_CTX *mem_ctx, struct ldb_dn *obj_dn,
-                             struct dom_sid **sid)
+static int samldb_get_parent_domain(struct samldb_ctx *ac);
+
+static int samldb_get_parent_domain_callback(struct ldb_request *req,
+                                            struct ldb_reply *ares)
 {
-       const char * const attrs[2] = { "objectSid", NULL };
-       struct ldb_result *res = NULL;
-       struct ldb_dn *dom_dn;
+       struct samldb_ctx *ac;
+       const char *nextRid;
        int ret;
-       struct dom_sid *dom_sid;
 
-       /* get the domain component part of the provided dn */
+       ac = talloc_get_type(req->context, struct samldb_ctx);
 
-       dom_dn = samldb_search_domain(module, mem_ctx, obj_dn);
-       if (dom_dn == NULL) {
-               ldb_asprintf_errstring(module->ldb,
-                                       "Invalid dn (%s) not child of a domain object!\n",
-                                       ldb_dn_get_linearized(obj_dn));
-               return LDB_ERR_CONSTRAINT_VIOLATION;
+       if (!ares) {
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto done;
        }
+       if (ares->error != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, ares->controls,
+                                       ares->response, ares->error);
+       }
+
+       switch (ares->type) {
+       case LDB_REPLY_ENTRY:
+               /* save entry */
+               if (ac->domain_dn != NULL) {
+                       /* one too many! */
+                       ldb_set_errstring(ac->module->ldb,
+                               "Invalid number of results while searching "
+                               "for domain object");
+                       ret = LDB_ERR_OPERATIONS_ERROR;
+                       break;
+               }
 
-       /* find the domain sid */
+               nextRid = ldb_msg_find_attr_as_string(ares->message,
+                                                     "nextRid", NULL);
+               if (nextRid == NULL) {
+                       ldb_asprintf_errstring(ac->module->ldb,
+                               "while looking for domain above %s attribute nextRid not found in %s\n",
+                                              ldb_dn_get_linearized(ac->req->op.add.message->dn), 
+                                              ldb_dn_get_linearized(ares->message->dn));
+                       ret = LDB_ERR_OPERATIONS_ERROR;
+                       break;
+               }
+
+               ac->next_rid = strtol(nextRid, NULL, 0);
+
+               ac->domain_sid = samdb_result_dom_sid(ac, ares->message,
+                                                               "objectSid");
+               if (ac->domain_sid == NULL) {
+                       ldb_set_errstring(ac->module->ldb,
+                               "error retrieving parent domain domain sid!\n");
+                       ret = LDB_ERR_CONSTRAINT_VIOLATION;
+                       break;
+               }
+               ac->domain_dn = talloc_steal(ac, ares->message->dn);
+
+               talloc_free(ares);
+               ret = LDB_SUCCESS;
+               ldb_reset_err_string(ac->module->ldb);
+               break;
+
+       case LDB_REPLY_REFERRAL:
+               /* ignore */
+               talloc_free(ares);
+               ret = LDB_SUCCESS;
+               break;
 
-       ret = ldb_search(module->ldb, dom_dn, LDB_SCOPE_BASE, "objectSid=*", attrs, &res);
+       case LDB_REPLY_DONE:
+
+               talloc_free(ares);
+               if (ac->domain_dn == NULL) {
+                       /* search again */
+                       ret = samldb_get_parent_domain(ac);
+               } else {
+                       /* found, go on */
+                       ret = samldb_next_step(ac);
+               }
+               break;
+       }
+
+done:
        if (ret != LDB_SUCCESS) {
-               ldb_asprintf_errstring(module->ldb,
-                                       "samldb_get_new_sid: error retrieving domain sid from %s: %s!\n",
-                                       ldb_dn_get_linearized(dom_dn),
-                                       ldb_errstring(module->ldb));
-               talloc_free(res);
-               return ret;
+               return ldb_module_done(ac->req, NULL, NULL, ret);
        }
 
-       if (res->count != 1) {
-               ldb_asprintf_errstring(module->ldb,
-                                       "samldb_get_new_sid: error retrieving domain sid from %s: not found!\n",
-                                       ldb_dn_get_linearized(dom_dn));
-               talloc_free(res);
-               return LDB_ERR_CONSTRAINT_VIOLATION;
+       return LDB_SUCCESS;
+}
+
+/* Find a domain object in the parents of a particular DN.  */
+static int samldb_get_parent_domain(struct samldb_ctx *ac)
+{
+       static const char * const attrs[3] = { "objectSid", "nextRid", NULL };
+       struct ldb_request *req;
+       struct ldb_dn *dn;
+       int ret;
+
+       if (ac->check_dn == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       dom_sid = samdb_result_dom_sid(res, res->msgs[0], "objectSid");
-       if (dom_sid == NULL) {
-               ldb_set_errstring(module->ldb, "samldb_get_new_sid: error parsing domain sid!\n");
-               talloc_free(res);
+       dn = ldb_dn_get_parent(ac, ac->check_dn);
+       if (dn == NULL) {
+               ldb_set_errstring(ac->module->ldb,
+                       "Unable to find parent domain object");
                return LDB_ERR_CONSTRAINT_VIOLATION;
        }
 
-       /* allocate a new Rid for the domain */
-       ret = samldb_allocate_next_rid(module, mem_ctx, dom_dn, dom_sid, sid);
-       if (ret != 0) {
-               ldb_debug(module->ldb, LDB_DEBUG_FATAL, "Failed to increment nextRid of %s: %s\n", ldb_dn_get_linearized(dom_dn), ldb_errstring(module->ldb));
-               talloc_free(res);
+       ac->check_dn = dn;
+
+       ret = ldb_build_search_req(&req, ac->module->ldb, ac,
+                                  dn, LDB_SCOPE_BASE,
+                                  "(|(objectClass=domain)"
+                                    "(objectClass=builtinDomain)"
+                                    "(objectClass=samba4LocalDomain))",
+                                  attrs,
+                                  NULL,
+                                  ac, samldb_get_parent_domain_callback,
+                                  ac->req);
+
+       if (ret != LDB_SUCCESS) {
                return ret;
        }
 
-       talloc_free(res);
-
-       return ret;
+       return ldb_next_request(ac->module, req);
 }
 
-/* If we are adding new users/groups, we need to update the nextRid
- * attribute to be 'above' all incoming users RIDs.  This tries to
- * avoid clashes in future */
+static int samldb_generate_samAccountName(struct ldb_message *msg)
+{
+       char *name;
+
+       /* Format: $000000-000000000000 */
+
+       name = talloc_asprintf(msg, "$%.6X-%.6X%.6X",
+                               (unsigned int)generate_random(),
+                               (unsigned int)generate_random(),
+                               (unsigned int)generate_random());
+       if (name == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+       return ldb_msg_add_steal_string(msg, "samAccountName", name);
+}
 
-int samldb_notice_sid(struct ldb_module *module, 
-                     TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
+static int samldb_check_samAccountName_callback(struct ldb_request *req,
+                                               struct ldb_reply *ares)
 {
+       struct samldb_ctx *ac;
        int ret;
-       struct ldb_dn *dom_dn;
-       struct dom_sid *dom_sid;
-       const char *attrs[] = { NULL };
-       struct ldb_result *dom_res;
-       struct ldb_result *res;
-       uint32_t old_rid;
-       char *filter;
 
-       /* find if this SID already exists */
+       ac = talloc_get_type(req->context, struct samldb_ctx);
 
-       filter = talloc_asprintf(mem_ctx, "(objectSid=%s)",
-                                ldap_encode_ndr_dom_sid(mem_ctx, sid));
+       if (!ares) {
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto done;
+       }
+       if (ares->error != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, ares->controls,
+                                       ares->response, ares->error);
+       }
 
-       ret = ldb_search(module->ldb, NULL, LDB_SCOPE_SUBTREE, filter, attrs, &res);
-       if (ret == LDB_SUCCESS) {
-               if (res->count > 0) {
-                       talloc_free(res);
-                       ldb_asprintf_errstring(module->ldb,
-                                               "Attempt to add record with SID %s rejected,"
-                                               " because this SID is already in the database",
-                                               dom_sid_string(mem_ctx, sid));
-                       /* We have a duplicate SID, we must reject the add */
-                       return LDB_ERR_CONSTRAINT_VIOLATION;
+       switch (ares->type) {
+       case LDB_REPLY_ENTRY:
+
+               /* if we get an entry it means this samAccountName
+                * already exists */
+               return ldb_module_done(ac->req, NULL, NULL,
+                                       LDB_ERR_ENTRY_ALREADY_EXISTS);
+
+       case LDB_REPLY_REFERRAL:
+               /* ignore */
+               talloc_free(ares);
+               ret = LDB_SUCCESS;
+               break;
+
+       case LDB_REPLY_DONE:
+
+               /* not found, go on */
+               talloc_free(ares);
+               ret = samldb_next_step(ac);
+               break;
+       }
+
+done:
+       if (ret != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, NULL, NULL, ret);
+       }
+
+       return LDB_SUCCESS;
+}
+
+static int samldb_check_samAccountName(struct samldb_ctx *ac)
+{
+       struct ldb_request *req;
+       const char *name;
+       char *filter;
+       int ret;
+
+       if (ldb_msg_find_element(ac->msg, "samAccountName") == NULL) {
+               ret = samldb_generate_samAccountName(ac->msg);
+               if (ret != LDB_SUCCESS) {
+                       return ret;
                }
-               talloc_free(res);
-       } else {
-               ldb_asprintf_errstring(module->ldb,
-                                       "samldb_notice_sid: error searching to see if sid %s is in use: %s\n", 
-                                       dom_sid_string(mem_ctx, sid), 
-                                       ldb_errstring(module->ldb));
-               return ret;
        }
 
-       dom_sid = dom_sid_dup(mem_ctx, sid);
-       if (!dom_sid) {
+       name = ldb_msg_find_attr_as_string(ac->msg, "samAccountName", NULL);
+       if (name == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+       filter = talloc_asprintf(ac, "samAccountName=%s", name);
+       if (filter == NULL) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
-       /* get the domain component part of the provided SID */
-       dom_sid->num_auths--;
-
-       /* find the domain DN */
-       
-       filter = talloc_asprintf(mem_ctx, "(&(objectSid=%s)(objectclass=domain))",
-                                ldap_encode_ndr_dom_sid(mem_ctx, dom_sid));
-
-       ret = ldb_search(module->ldb, NULL, LDB_SCOPE_SUBTREE, filter, attrs, &dom_res);
-       if (ret == LDB_SUCCESS) {
-               talloc_steal(mem_ctx, dom_res);
-               if (dom_res->count == 0) {
-                       talloc_free(dom_res);
-                       /* This isn't an operation on a domain we know about, so nothing to update */
-                       return LDB_SUCCESS;
-               }
 
-               if (dom_res->count > 1) {
-                       talloc_free(dom_res);
-                       ldb_asprintf_errstring(module->ldb,
-                                       "samldb_notice_sid: error retrieving domain from sid: duplicate (found %d) domain: %s!\n", 
-                                       dom_res->count, dom_sid_string(dom_res, dom_sid));
-                       return LDB_ERR_OPERATIONS_ERROR;
-               }
-       } else {
-               ldb_asprintf_errstring(module->ldb,
-                                       "samldb_notice_sid: error retrieving domain from sid: %s: %s\n", 
-                                       dom_sid_string(dom_res, dom_sid), 
-                                       ldb_errstring(module->ldb));
+       ret = ldb_build_search_req(&req, ac->module->ldb, ac,
+                               ac->domain_dn, LDB_SCOPE_SUBTREE,
+                               filter, NULL,
+                               NULL,
+                               ac, samldb_check_samAccountName_callback,
+                               ac->req);
+       talloc_free(filter);
+       if (ret != LDB_SUCCESS) {
                return ret;
        }
+       ac->ares = NULL;
+       return ldb_next_request(ac->module, req);
+}
 
-       dom_dn = dom_res->msgs[0]->dn;
+static int samldb_check_samAccountType(struct samldb_ctx *ac)
+{
+       unsigned int account_type;
+       unsigned int group_type;
+       unsigned int uac;
+       int ret;
 
-       ret = samldb_find_next_rid(module, mem_ctx, 
-                                  dom_dn, &old_rid);
-       if (ret) {
-               talloc_free(dom_res);
-               return ret;
+       /* make sure sAMAccountType is not specified */
+       if (ldb_msg_find_element(ac->msg, "sAMAccountType") != NULL) {
+               ldb_asprintf_errstring(ac->module->ldb,
+                                       "sAMAccountType must not be specified");
+               return LDB_ERR_UNWILLING_TO_PERFORM;
        }
 
-       if (old_rid <= sid->sub_auths[sid->num_auths - 1]) {
-               ret = samldb_set_next_rid(module->ldb, mem_ctx, dom_dn, old_rid, 
-                                         sid->sub_auths[sid->num_auths - 1] + 1);
+       if (strcmp("user", ac->type) == 0) {
+               uac = samdb_result_uint(ac->msg, "userAccountControl", 0);
+               if (uac == 0) {
+                       ldb_asprintf_errstring(ac->module->ldb,
+                                               "userAccountControl invalid");
+                       return LDB_ERR_UNWILLING_TO_PERFORM;
+               } else {
+                       account_type = samdb_uf2atype(uac);
+                       ret = samdb_msg_add_uint(ac->module->ldb,
+                                                ac->msg, ac->msg,
+                                                "sAMAccountType",
+                                                account_type);
+                       if (ret != LDB_SUCCESS) {
+                               return ret;
+                       }
+               }
+       } else
+       if (strcmp("group", ac->type) == 0) {
+
+               group_type = samdb_result_uint(ac->msg, "groupType", 0);
+               if (group_type == 0) {
+                       ldb_asprintf_errstring(ac->module->ldb,
+                                               "groupType invalid");
+                       return LDB_ERR_UNWILLING_TO_PERFORM;
+               } else {
+                       account_type = samdb_gtype2atype(group_type);
+                       ret = samdb_msg_add_uint(ac->module->ldb,
+                                                ac->msg, ac->msg,
+                                                "sAMAccountType",
+                                                account_type);
+                       if (ret != LDB_SUCCESS) {
+                               return ret;
+                       }
+               }
        }
-       talloc_free(dom_res);
-       return ret;
+
+       return samldb_next_step(ac);
 }
 
-static int samldb_handle_sid(struct ldb_module *module, 
-                                        TALLOC_CTX *mem_ctx, struct ldb_message *msg2)
+static int samldb_get_sid_domain_callback(struct ldb_request *req,
+                                         struct ldb_reply *ares)
 {
+       struct samldb_ctx *ac;
+       const char *nextRid;
        int ret;
-       
-       struct dom_sid *sid = samdb_result_dom_sid(mem_ctx, msg2, "objectSid");
-       if (sid == NULL) { 
-               ret = samldb_get_new_sid(module, msg2, msg2->dn, &sid);
-               if (ret != 0) {
-                       return ret;
+
+       ac = talloc_get_type(req->context, struct samldb_ctx);
+
+       if (!ares) {
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto done;
+       }
+       if (ares->error != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, ares->controls,
+                                       ares->response, ares->error);
+       }
+
+       switch (ares->type) {
+       case LDB_REPLY_ENTRY:
+               /* save entry */
+               if (ac->next_rid != 0) {
+                       /* one too many! */
+                       ldb_set_errstring(ac->module->ldb,
+                               "Invalid number of results while searching "
+                               "for domain object");
+                       ret = LDB_ERR_OPERATIONS_ERROR;
+                       break;
                }
 
-               if ( ! samldb_msg_add_sid(module, msg2, "objectSid", sid)) {
-                       talloc_free(sid);
-                       return LDB_ERR_OPERATIONS_ERROR;
+               nextRid = ldb_msg_find_attr_as_string(ares->message,
+                                                       "nextRid", NULL);
+               if (nextRid == NULL) {
+                       ldb_asprintf_errstring(ac->module->ldb,
+                               "attribute nextRid not found in %s\n",
+                               ldb_dn_get_linearized(ares->message->dn));
+                       ret = LDB_ERR_OPERATIONS_ERROR;
+                       break;
                }
-               talloc_free(sid);
+
+               ac->next_rid = strtol(nextRid, NULL, 0);
+
+               ac->domain_dn = talloc_steal(ac, ares->message->dn);
+
+               talloc_free(ares);
                ret = LDB_SUCCESS;
-       } else {
-               ret = samldb_notice_sid(module, msg2, sid);
-       }
-       return ret;
-}
+               break;
 
-static char *samldb_generate_samAccountName(struct ldb_module *module, TALLOC_CTX *mem_ctx) 
-{
-       char *name;
-       const char *attrs[] = { NULL };
-       struct ldb_message **msgs;
-       int ret;
-       
-       /* Format: $000000-000000000000 */
-       
-       do {
-               name = talloc_asprintf(mem_ctx, "$%.6X-%.6X%.6X", (unsigned int)random(), (unsigned int)random(), (unsigned int)random());
-               /* TODO: Figure out exactly what this is meant to conflict with */
-               ret = gendb_search(module->ldb,
-                                  mem_ctx, NULL, &msgs, attrs,
-                                  "samAccountName=%s",
-                                  ldb_binary_encode_string(mem_ctx, name));
-               if (ret == 0) {
-                       /* Great. There are no conflicting users/groups/etc */
-                       return name;
-               } else if (ret == -1) {
-                       /* Bugger, there is a problem, and we don't know what it is until gendb_search improves */
-                       return NULL;
-               } else {
-                       talloc_free(name);
-                        /* gah, there are conflicting sids, lets move around the loop again... */
+       case LDB_REPLY_REFERRAL:
+               /* ignore */
+               talloc_free(ares);
+               ret = LDB_SUCCESS;
+               break;
+
+       case LDB_REPLY_DONE:
+
+               if (ac->next_rid == 0) {
+                       ldb_asprintf_errstring(ac->module->ldb,
+                               "Unable to get nextRid from domain entry\n");
+                       ret = LDB_ERR_OPERATIONS_ERROR;
+                       break;
                }
-       } while (1);
+
+               /* found, go on */
+               ret = samldb_next_step(ac);
+               break;
+       }
+
+done:
+       if (ret != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, NULL, NULL, ret);
+       }
+
+       return LDB_SUCCESS;
 }
 
-static int samldb_fill_group_object(struct ldb_module *module, const struct ldb_message *msg,
-                                                   struct ldb_message **ret_msg)
+/* Find a domain object in the parents of a particular DN.  */
+static int samldb_get_sid_domain(struct samldb_ctx *ac)
 {
+       static const char * const attrs[2] = { "nextRid", NULL };
+       struct ldb_request *req;
+       char *filter;
        int ret;
-       const char *name;
-       struct ldb_message *msg2;
-       const char *rdn_name;
-       TALLOC_CTX *mem_ctx = talloc_new(msg);
-       const char *errstr;
-       if (!mem_ctx) {
+
+       if (ac->sid == NULL) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       /* build the new msg */
-       msg2 = ldb_msg_copy(mem_ctx, msg);
-       if (!msg2) {
-               ldb_debug(module->ldb, LDB_DEBUG_FATAL, "samldb_fill_group_object: ldb_msg_copy failed!\n");
-               talloc_free(mem_ctx);
+       ac->domain_sid = dom_sid_dup(ac, ac->sid);
+       if (!ac->domain_sid) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+       /* get the domain component part of the provided SID */
+       ac->domain_sid->num_auths--;
+
+       filter = talloc_asprintf(ac, "(&(objectSid=%s)"
+                                      "(|(objectClass=domain)"
+                                        "(objectClass=builtinDomain)"
+                                        "(objectClass=samba4LocalDomain)))",
+                                ldap_encode_ndr_dom_sid(ac, ac->domain_sid));
+       if (filter == NULL) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       ret = samdb_copy_template(module->ldb, msg2, 
-                                 "(&(CN=TemplateGroup)(objectclass=groupTemplate))",
-                                 &errstr);
-       if (ret != 0) {
-               
-               talloc_free(mem_ctx);
+       ret = ldb_build_search_req(&req, ac->module->ldb, ac,
+                                  ldb_get_default_basedn(ac->module->ldb),
+                                  LDB_SCOPE_SUBTREE,
+                                  filter, attrs,
+                                  NULL,
+                                  ac, samldb_get_sid_domain_callback,
+                                  ac->req);
+
+       if (ret != LDB_SUCCESS) {
                return ret;
        }
 
-       rdn_name = ldb_dn_get_rdn_name(msg2->dn);
+       ac->next_rid = 0;
+       return ldb_next_request(ac->module, req);
+}
 
-       if (strcasecmp(rdn_name, "cn") != 0) {
-               ldb_debug(module->ldb, LDB_DEBUG_FATAL, "samldb_fill_group_object: Bad RDN (%s) for group!\n", rdn_name);
-               talloc_free(mem_ctx);
-               return LDB_ERR_CONSTRAINT_VIOLATION;
+static bool samldb_msg_add_sid(struct ldb_message *msg,
+                               const char *name,
+                               const struct dom_sid *sid)
+{
+       struct ldb_val v;
+       enum ndr_err_code ndr_err;
+
+       ndr_err = ndr_push_struct_blob(&v, msg, NULL, sid,
+                                      (ndr_push_flags_fn_t)ndr_push_dom_sid);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               return false;
        }
+       return (ldb_msg_add_value(msg, name, &v, NULL) == 0);
+}
 
-       /* Generate a random name, if no samAccountName was supplied */
-       if (ldb_msg_find_element(msg2, "samAccountName") == NULL) {
-               name = samldb_generate_samAccountName(module, mem_ctx);
-               if (!name) {
-                       talloc_free(mem_ctx);
-                       return LDB_ERR_OPERATIONS_ERROR;
-               }
-               ret = samdb_find_or_add_attribute(module->ldb, msg2, "sAMAccountName", name);
-               if (ret) {
-                       talloc_free(mem_ctx);
-                       return ret;
-               }
+static int samldb_new_sid(struct samldb_ctx *ac)
+{
+
+       if (ac->domain_sid == NULL || ac->next_rid == 0) {
+               return LDB_ERR_OPERATIONS_ERROR;
        }
-       
-       /* Manage SID allocation, conflicts etc */
-       ret = samldb_handle_sid(module, mem_ctx, msg2); 
 
-       if (ret == LDB_SUCCESS) {
-               talloc_steal(msg, msg2);
-               *ret_msg = msg2;
+       ac->sid = dom_sid_add_rid(ac, ac->domain_sid, ac->next_rid + 1);
+       if (ac->sid == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       if ( ! samldb_msg_add_sid(ac->msg, "objectSid", ac->sid)) {
+               return LDB_ERR_OPERATIONS_ERROR;
        }
-       talloc_free(mem_ctx);
-       return ret;
+
+       return samldb_next_step(ac);
 }
 
-static int samldb_fill_user_or_computer_object(struct ldb_module *module, const struct ldb_message *msg,
-                                                              struct ldb_message **ret_msg)
+static int samldb_check_sid_callback(struct ldb_request *req,
+                                    struct ldb_reply *ares)
 {
+       struct samldb_ctx *ac;
        int ret;
-       char *name;
-       struct ldb_message *msg2;
-       const char *rdn_name;
-       TALLOC_CTX *mem_ctx = talloc_new(msg);
-       const char *errstr;
-       if (!mem_ctx) {
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
 
-       /* build the new msg */
-       msg2 = ldb_msg_copy(mem_ctx, msg);
-       if (!msg2) {
-               ldb_debug(module->ldb, LDB_DEBUG_FATAL, "samldb_fill_group_object: ldb_msg_copy failed!\n");
-               talloc_free(mem_ctx);
-               return LDB_ERR_OPERATIONS_ERROR;
+       ac = talloc_get_type(req->context, struct samldb_ctx);
+
+       if (!ares) {
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto done;
+       }
+       if (ares->error != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, ares->controls,
+                                       ares->response, ares->error);
        }
 
-       if (samdb_find_attribute(module->ldb, msg, "objectclass", "computer") != NULL) {
+       switch (ares->type) {
+       case LDB_REPLY_ENTRY:
 
-               ret = samdb_copy_template(module->ldb, msg2, 
-                                         "(&(CN=TemplateComputer)(objectclass=userTemplate))", 
-                                         &errstr);
-               if (ret) {
-                       ldb_asprintf_errstring(module->ldb, 
-                                              "samldb_fill_user_or_computer_object: "
-                                              "Error copying computer template: %s",
-                                              errstr);
-                       talloc_free(mem_ctx);
-                       return ret;
-               }
+               /* if we get an entry it means an object with the
+                * requested sid exists */
+               return ldb_module_done(ac->req, NULL, NULL,
+                                       LDB_ERR_CONSTRAINT_VIOLATION);
 
-               /* readd user and then computer objectclasses */
-               ret = samdb_find_or_add_value(module->ldb, msg2, "objectclass", "user");
-               if (ret) {
-                       talloc_free(mem_ctx);
-                       return ret;
-               }
-               ret = samdb_find_or_add_value(module->ldb, msg2, "objectclass", "computer");
-               if (ret) {
-                       talloc_free(mem_ctx);
-                       return ret;
-               }
-               
-       } else {
-               ret = samdb_copy_template(module->ldb, msg2, 
-                                         "(&(CN=TemplateUser)(objectclass=userTemplate))", 
-                                         &errstr);
-               if (ret) {
-                       ldb_asprintf_errstring(module->ldb, 
-                                              "samldb_fill_user_or_computer_object: Error copying user template: %s\n",
-                                              errstr);
-                       talloc_free(mem_ctx);
-                       return ret;
-               }
-               /* readd user objectclass */
-               ret = samdb_find_or_add_value(module->ldb, msg2, "objectclass", "user");
-               if (ret) {
-                       talloc_free(mem_ctx);
-                       return ret;
-               }
+       case LDB_REPLY_REFERRAL:
+               /* ignore */
+               talloc_free(ares);
+               break;
+
+       case LDB_REPLY_DONE:
+
+               /* not found, go on */
+               talloc_free(ares);
+               ret = samldb_next_step(ac);
+               break;
        }
 
-       rdn_name = ldb_dn_get_rdn_name(msg2->dn);
+done:
+       if (ret != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, NULL, NULL, ret);
+       }
 
-       if (strcasecmp(rdn_name, "cn") != 0) {
-               ldb_asprintf_errstring(module->ldb, "Bad RDN (%s=) for user/computer, should be CN=!\n", rdn_name);
-               talloc_free(mem_ctx);
-               return LDB_ERR_CONSTRAINT_VIOLATION;
+       return LDB_SUCCESS;
+}
+
+static int samldb_check_sid(struct samldb_ctx *ac)
+{
+       const char *const attrs[2] = { "objectSid", NULL };
+       struct ldb_request *req;
+       char *filter;
+       int ret;
+
+       if (ac->sid == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       if (ldb_msg_find_element(msg2, "samAccountName") == NULL) {
-               name = samldb_generate_samAccountName(module, mem_ctx);
-               if (!name) {
-                       talloc_free(mem_ctx);
-                       return LDB_ERR_OPERATIONS_ERROR;
-               }
-               ret = samdb_find_or_add_attribute(module->ldb, msg2, "sAMAccountName", name);
-               if (ret) {
-                       talloc_free(mem_ctx);
-                       return ret;
-               }
+       filter = talloc_asprintf(ac, "(objectSid=%s)",
+                                ldap_encode_ndr_dom_sid(ac, ac->sid));
+       if (filter == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       /*
-         TODO: useraccountcontrol: setting value 0 gives 0x200 for users
-       */
+       ret = ldb_build_search_req(&req, ac->module->ldb, ac,
+                                  ldb_get_default_basedn(ac->module->ldb),
+                                  LDB_SCOPE_SUBTREE,
+                                  filter, attrs,
+                                  NULL,
+                                  ac, samldb_check_sid_callback,
+                                  ac->req);
+
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
 
-       /* Manage SID allocation, conflicts etc */
-       ret = samldb_handle_sid(module, mem_ctx, msg2); 
+       return ldb_next_request(ac->module, req);
+}
 
-       /* TODO: objectCategory, userAccountControl, badPwdCount, codePage, countryCode, badPasswordTime, lastLogoff, lastLogon, pwdLastSet, primaryGroupID, accountExpires, logonCount */
+static int samldb_notice_sid_callback(struct ldb_request *req,
+                                       struct ldb_reply *ares)
+{
+       struct samldb_ctx *ac;
+       int ret;
 
-       if (ret == 0) {
-               *ret_msg = msg2;
-               talloc_steal(msg, msg2);
+       ac = talloc_get_type(req->context, struct samldb_ctx);
+
+       if (!ares) {
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto done;
+       }
+       if (ares->error != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, ares->controls,
+                                       ares->response, ares->error);
+       }
+       if (ares->type != LDB_REPLY_DONE) {
+               ldb_set_errstring(ac->module->ldb,
+                       "Invalid reply type!\n");
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto done;
+       }
+
+       ret = samldb_next_step(ac);
+
+done:
+       if (ret != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, NULL, NULL, ret);
        }
-       talloc_free(mem_ctx);
-       return ret;
+
+       return LDB_SUCCESS;
 }
-       
-static int samldb_fill_foreignSecurityPrincipal_object(struct ldb_module *module, const struct ldb_message *msg, 
-                                                      struct ldb_message **ret_msg)
+
+/* If we are adding new users/groups, we need to update the nextRid
+ * attribute to be 'above' the new/incoming RID. Attempt to do it
+ *atomically. */
+static int samldb_notice_sid(struct samldb_ctx *ac)
 {
-       struct ldb_message *msg2;
-       const char *rdn_name;
-       struct dom_sid *dom_sid;
-       struct dom_sid *sid;
-       const char *dom_attrs[] = { "name", NULL };
-       struct ldb_message **dom_msgs;
-       const char *errstr;
+       uint32_t old_id, new_id;
+       struct ldb_request *req;
+       struct ldb_message *msg;
+       struct ldb_message_element *els;
+       struct ldb_val *vals;
        int ret;
 
-       TALLOC_CTX *mem_ctx = talloc_new(msg);
-       if (!mem_ctx) {
+       old_id = ac->next_rid;
+       new_id = ac->sid->sub_auths[ac->sid->num_auths - 1];
+
+       if (old_id >= new_id) {
+               /* no need to update the domain nextRid attribute */
+               return samldb_next_step(ac);
+       }
+
+       /* we do a delete and add as a single operation. That prevents
+          a race, in case we are not actually on a transaction db */
+       msg = talloc_zero(ac, struct ldb_message);
+       if (msg == NULL) {
+               ldb_oom(ac->module->ldb);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+       els = talloc_array(msg, struct ldb_message_element, 2);
+       if (els == NULL) {
+               ldb_oom(ac->module->ldb);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+       vals = talloc_array(msg, struct ldb_val, 2);
+       if (vals == NULL) {
+               ldb_oom(ac->module->ldb);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+       msg->dn = ac->domain_dn;
+       msg->num_elements = 2;
+       msg->elements = els;
+
+       els[0].num_values = 1;
+       els[0].values = &vals[0];
+       els[0].flags = LDB_FLAG_MOD_DELETE;
+       els[0].name = talloc_strdup(msg, "nextRid");
+       if (!els[0].name) {
+               ldb_oom(ac->module->ldb);
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       /* build the new msg */
-       msg2 = ldb_msg_copy(mem_ctx, msg);
-       if (!msg2) {
-               ldb_debug(module->ldb, LDB_DEBUG_FATAL, "samldb_fill_foreignSecurityPrincpal_object: ldb_msg_copy failed!\n");
-               talloc_free(mem_ctx);
+       els[1].num_values = 1;
+       els[1].values = &vals[1];
+       els[1].flags = LDB_FLAG_MOD_ADD;
+       els[1].name = els[0].name;
+
+       vals[0].data = (uint8_t *)talloc_asprintf(vals, "%u", old_id);
+       if (!vals[0].data) {
+               ldb_oom(ac->module->ldb);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+       vals[0].length = strlen((char *)vals[0].data);
+
+       vals[1].data = (uint8_t *)talloc_asprintf(vals, "%u", new_id);
+       if (!vals[1].data) {
+               ldb_oom(ac->module->ldb);
                return LDB_ERR_OPERATIONS_ERROR;
        }
+       vals[1].length = strlen((char *)vals[1].data);
 
-       ret = samdb_copy_template(module->ldb, msg2, 
-                                 "(&(CN=TemplateForeignSecurityPrincipal)(objectclass=foreignSecurityPrincipalTemplate))",
-                                 &errstr);
-       if (ret != 0) {
-               ldb_asprintf_errstring(module->ldb, 
-                                      "samldb_fill_foreignSecurityPrincipal_object: "
-                                      "Error copying template: %s",
-                                   errstr);
-               talloc_free(mem_ctx);
+       ret = ldb_build_mod_req(&req, ac->module->ldb, ac,
+                               msg, NULL,
+                               ac, samldb_notice_sid_callback,
+                               ac->req);
+       if (ret != LDB_SUCCESS) {
                return ret;
        }
 
-       rdn_name = ldb_dn_get_rdn_name(msg2->dn);
+       return ldb_next_request(ac->module, req);
+}
 
-       if (strcasecmp(rdn_name, "cn") != 0) {
-               ldb_asprintf_errstring(module->ldb, "Bad RDN (%s=) for ForeignSecurityPrincipal, should be CN=!", rdn_name);
-               talloc_free(mem_ctx);
-               return LDB_ERR_CONSTRAINT_VIOLATION;
+static int samldb_add_entry_callback(struct ldb_request *req,
+                                       struct ldb_reply *ares)
+{
+       struct samldb_ctx *ac;
+
+       ac = talloc_get_type(req->context, struct samldb_ctx);
+
+       if (!ares) {
+               return ldb_module_done(ac->req, NULL, NULL,
+                                       LDB_ERR_OPERATIONS_ERROR);
+       }
+       if (ares->error != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, ares->controls,
+                                       ares->response, ares->error);
+       }
+       if (ares->type != LDB_REPLY_DONE) {
+               ldb_set_errstring(ac->module->ldb,
+                       "Invalid reply type!\n");
+               return ldb_module_done(ac->req, NULL, NULL,
+                                       LDB_ERR_OPERATIONS_ERROR);
+       }
+
+       /* we exit the samldb module here */
+       return ldb_module_done(ac->req, ares->controls,
+                               ares->response, LDB_SUCCESS);
+}
+
+static int samldb_add_entry(struct samldb_ctx *ac)
+{
+       struct ldb_request *req;
+       int ret;
+
+       ret = ldb_build_add_req(&req, ac->module->ldb, ac,
+                               ac->msg,
+                               ac->req->controls,
+                               ac, samldb_add_entry_callback,
+                               ac->req);
+       if (ret != LDB_SUCCESS) {
+               return ret;
        }
 
-       /* Slightly different for the foreign sids.  We don't want
-        * domain SIDs ending up there, it would cause all sorts of
-        * pain */
+       return ldb_next_request(ac->module, req);
+}
 
-       sid = dom_sid_parse_talloc(msg2, (const char *)ldb_dn_get_rdn_val(msg2->dn)->data);
-       if (!sid) {
-               ldb_set_errstring(module->ldb, "No valid found SID in ForeignSecurityPrincipal CN!");
-               talloc_free(mem_ctx);
-               return LDB_ERR_CONSTRAINT_VIOLATION;
+static int samldb_fill_object(struct samldb_ctx *ac, const char *type)
+{
+       int ret;
+
+       /* first look for the template */
+       ac->type = type;
+       ret = samldb_add_step(ac, samldb_search_template);
+       if (ret != LDB_SUCCESS) return ret;
+
+       /* then apply it */
+       ret = samldb_add_step(ac, samldb_apply_template);
+       if (ret != LDB_SUCCESS) return ret;
+
+       /* search for a parent domain objet */
+       ac->check_dn = ac->req->op.add.message->dn;
+       ret = samldb_add_step(ac, samldb_get_parent_domain);
+       if (ret != LDB_SUCCESS) return ret;
+
+       /* check if we have a valid samAccountName */
+       ret = samldb_add_step(ac, samldb_check_samAccountName);
+       if (ret != LDB_SUCCESS) return ret;
+
+       /* check account_type/group_type */
+       ret = samldb_add_step(ac, samldb_check_samAccountType);
+       if (ret != LDB_SUCCESS) return ret;
+
+       /* check if we have a valid SID */
+       ac->sid = samdb_result_dom_sid(ac, ac->msg, "objectSid");
+       if ( ! ac->sid) {
+               ret = samldb_add_step(ac, samldb_new_sid);
+               if (ret != LDB_SUCCESS) return ret;
+       } else {
+               ret = samldb_add_step(ac, samldb_get_sid_domain);
+               if (ret != LDB_SUCCESS) return ret;
        }
 
-       if ( ! samldb_msg_add_sid(module, msg2, "objectSid", sid)) {
-               talloc_free(sid);
+       ret = samldb_add_step(ac, samldb_check_sid);
+       if (ret != LDB_SUCCESS) return ret;
+
+       ret = samldb_add_step(ac, samldb_notice_sid);
+       if (ret != LDB_SUCCESS) return ret;
+
+       /* finally proceed with adding the entry */
+       ret = samldb_add_step(ac, samldb_add_entry);
+       if (ret != LDB_SUCCESS) return ret;
+
+       return samldb_first_step(ac);
+
+       /* TODO: userAccountControl, badPwdCount, codePage,
+        *       countryCode, badPasswordTime, lastLogoff, lastLogon,
+        *       pwdLastSet, primaryGroupID, accountExpires, logonCount */
+
+}
+
+static int samldb_foreign_notice_sid_callback(struct ldb_request *req,
+                                               struct ldb_reply *ares)
+{
+       struct samldb_ctx *ac;
+       const char *nextRid;
+       const char *name;
+       int ret;
+
+       ac = talloc_get_type(req->context, struct samldb_ctx);
+
+       if (!ares) {
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto done;
+       }
+       if (ares->error != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, ares->controls,
+                                       ares->response, ares->error);
+       }
+
+       switch (ares->type) {
+       case LDB_REPLY_ENTRY:
+               /* save entry */
+               if (ac->next_rid != 0) {
+                       /* one too many! */
+                       ldb_set_errstring(ac->module->ldb,
+                               "Invalid number of results while searching "
+                               "for domain object");
+                       ret = LDB_ERR_OPERATIONS_ERROR;
+                       break;
+               }
+
+               nextRid = ldb_msg_find_attr_as_string(ares->message,
+                                                       "nextRid", NULL);
+               if (nextRid == NULL) {
+                       ldb_asprintf_errstring(ac->module->ldb,
+                               "while looking for forign sid %s attribute nextRid not found in %s\n",
+                                              dom_sid_string(ares, ac->sid), ldb_dn_get_linearized(ares->message->dn));
+                       ret = LDB_ERR_OPERATIONS_ERROR;
+                       break;
+               }
+
+               ac->next_rid = strtol(nextRid, NULL, 0);
+
+               ac->domain_dn = talloc_steal(ac, ares->message->dn);
+
+               name = samdb_result_string(ares->message, "name", NULL);
+               ldb_debug(ac->module->ldb, LDB_DEBUG_TRACE,
+                        "NOTE (strange but valid): Adding foreign SID "
+                        "record with SID %s, but this domain (%s) is "
+                        "not foreign in the database",
+                        dom_sid_string(ares, ac->sid), name);
+
+               talloc_free(ares);
+               break;
+
+       case LDB_REPLY_REFERRAL:
+               /* ignore */
+               talloc_free(ares);
+               break;
+
+       case LDB_REPLY_DONE:
+
+               /* if this is a fake foreign SID, notice the SID */
+               if (ac->domain_dn) {
+                       ret = samldb_notice_sid(ac);
+                       break;
+               }
+
+               /* found, go on */
+               ret = samldb_next_step(ac);
+               break;
+       }
+
+done:
+       if (ret != LDB_SUCCESS) {
+               return ldb_module_done(ac->req, NULL, NULL, ret);
+       }
+
+       return LDB_SUCCESS;
+}
+
+/* Find a domain object in the parents of a particular DN. */
+static int samldb_foreign_notice_sid(struct samldb_ctx *ac)
+{
+       static const char * const attrs[3] = { "nextRid", "name", NULL };
+       struct ldb_request *req;
+       NTSTATUS status;
+       char *filter;
+       int ret;
+
+       if (ac->sid == NULL) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       dom_sid = dom_sid_dup(mem_ctx, sid);
-       if (!dom_sid) {
-               talloc_free(mem_ctx);
+       status = dom_sid_split_rid(ac, ac->sid, &ac->domain_sid, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
-       /* get the domain component part of the provided SID */
-       dom_sid->num_auths--;
-
-       /* find the domain DN */
-
-       ret = gendb_search(module->ldb,
-                          mem_ctx, NULL, &dom_msgs, dom_attrs,
-                          "(&(objectSid=%s)(objectclass=domain))",
-                          ldap_encode_ndr_dom_sid(mem_ctx, dom_sid));
-       if (ret >= 1) {
-               /* We don't really like the idea of foreign sids that are not foreign, but it happens */
-               const char *name = samdb_result_string(dom_msgs[0], "name", NULL);
-               ldb_debug(module->ldb, LDB_DEBUG_TRACE, "NOTE (strange but valid): Adding foreign SID record with SID %s, but this domian (%s) is already in the database", 
-                         dom_sid_string(mem_ctx, sid), name); 
-       } else if (ret == -1) {
-               ldb_asprintf_errstring(module->ldb,
-                                       "samldb_fill_foreignSecurityPrincipal_object: error searching for a domain with this sid: %s\n", 
-                                       dom_sid_string(mem_ctx, dom_sid));
-               talloc_free(dom_msgs);
+
+       filter = talloc_asprintf(ac, "(&(objectSid=%s)(objectclass=domain))",
+                                ldap_encode_ndr_dom_sid(ac, ac->domain_sid));
+       if (filter == NULL) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       /* This isn't an operation on a domain we know about, so just
-        * check for the SID, looking for duplicates via the common
-        * code */
-       ret = samldb_notice_sid(module, msg2, sid);
-       if (ret == 0) {
-               talloc_steal(msg, msg2);
-               *ret_msg = msg2;
+       ret = ldb_build_search_req(&req, ac->module->ldb, ac,
+                                  ldb_get_default_basedn(ac->module->ldb),
+                                  LDB_SCOPE_SUBTREE,
+                                  filter, attrs,
+                                  NULL,
+                                  ac, samldb_foreign_notice_sid_callback,
+                                  ac->req);
+
+       if (ret != LDB_SUCCESS) {
+               return ret;
        }
-       
-       return ret;
+
+       ac->next_rid = 0;
+       return ldb_next_request(ac->module, req);
 }
 
-/* add_record */
+static int samldb_fill_foreignSecurityPrincipal_object(struct samldb_ctx *ac)
+{
+       int ret;
 
-/*
- * FIXME
- *
- * Actually this module is not async at all as it does a number of sync searches
- * in the process. It still to be decided how to deal with it properly so it is
- * left SYNC for now until we think of a good solution.
- */
+       ac->sid = samdb_result_dom_sid(ac->msg, ac->msg, "objectSid");
+       if (ac->sid == NULL) {
+               ac->sid = dom_sid_parse_talloc(ac->msg,
+                          (const char *)ldb_dn_get_rdn_val(ac->msg->dn)->data);
+               if (!ac->sid) {
+                       ldb_set_errstring(ac->module->ldb,
+                                       "No valid found SID in "
+                                       "ForeignSecurityPrincipal CN!");
+                       talloc_free(ac);
+                       return LDB_ERR_CONSTRAINT_VIOLATION;
+               }
+               if ( ! samldb_msg_add_sid(ac->msg, "objectSid", ac->sid)) {
+                       talloc_free(ac);
+                       return LDB_ERR_OPERATIONS_ERROR;
+               }
+       }
+
+       /* first look for the template */
+       ac->type = "foreignSecurityPrincipal";
+       ret = samldb_add_step(ac, samldb_search_template);
+       if (ret != LDB_SUCCESS) return ret;
+
+       /* then apply it */
+       ret = samldb_add_step(ac, samldb_apply_template);
+       if (ret != LDB_SUCCESS) return ret;
 
+       /* check we do not already have this SID */
+       ret = samldb_add_step(ac, samldb_check_sid);
+       if (ret != LDB_SUCCESS) return ret;
+
+       /* check if we need to notice this SID */
+       ret = samldb_add_step(ac, samldb_foreign_notice_sid);
+       if (ret != LDB_SUCCESS) return ret;
+
+       /* finally proceed with adding the entry */
+       ret = samldb_add_step(ac, samldb_add_entry);
+       if (ret != LDB_SUCCESS) return ret;
+
+       return samldb_first_step(ac);
+}
+
+static int samldb_check_rdn(struct ldb_module *module, struct ldb_dn *dn)
+{
+       const char *rdn_name;
+
+       rdn_name = ldb_dn_get_rdn_name(dn);
+
+       if (strcasecmp(rdn_name, "cn") != 0) {
+               ldb_asprintf_errstring(module->ldb,
+                                       "Bad RDN (%s=) for samldb object, "
+                                       "should be CN=!\n", rdn_name);
+               return LDB_ERR_CONSTRAINT_VIOLATION;
+       }
+
+       return LDB_SUCCESS;
+}
+
+/* add_record */
 static int samldb_add(struct ldb_module *module, struct ldb_request *req)
 {
-       const struct ldb_message *msg = req->op.add.message;
-       struct ldb_message *msg2 = NULL;
-       struct ldb_request *down_req;
+       struct samldb_ctx *ac;
        int ret;
 
        ldb_debug(module->ldb, LDB_DEBUG_TRACE, "samldb_add_record\n");
 
-       if (ldb_dn_is_special(msg->dn)) { /* do not manipulate our control entries */
+       /* do not manipulate our control entries */
+       if (ldb_dn_is_special(req->op.add.message->dn)) {
                return ldb_next_request(module, req);
        }
 
-       /* is user or computer? */
-       if ((samdb_find_attribute(module->ldb, msg, "objectclass", "user") != NULL) ||
-           (samdb_find_attribute(module->ldb, msg, "objectclass", "computer") != NULL)) {
-               /*  add all relevant missing objects */
-               ret = samldb_fill_user_or_computer_object(module, msg, &msg2);
-               if (ret) {
+       ac = samldb_ctx_init(module, req);
+       if (ac == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       /* build the new msg */
+       ac->msg = ldb_msg_copy(ac, ac->req->op.add.message);
+       if (!ac->msg) {
+               talloc_free(ac);
+               ldb_debug(ac->module->ldb, LDB_DEBUG_FATAL,
+                         "samldb_add: ldb_msg_copy failed!\n");
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       if (samdb_find_attribute(module->ldb, ac->msg,
+                                "objectclass", "computer") != NULL) {
+
+               /* make sure the computer object also has the 'user'
+                * objectclass so it will be handled by the next call */
+               ret = samdb_find_or_add_value(module->ldb, ac->msg,
+                                               "objectclass", "user");
+               if (ret != LDB_SUCCESS) {
+                       talloc_free(ac);
                        return ret;
                }
        }
 
-       /* is group? add all relevant missing objects */
-       if ( ! msg2 ) {
-               if (samdb_find_attribute(module->ldb, msg, "objectclass", "group") != NULL) {
-                       ret = samldb_fill_group_object(module, msg, &msg2);
-                       if (ret) {
-                               return ret;
-                       }
+       if (samdb_find_attribute(module->ldb, ac->msg,
+                                "objectclass", "user") != NULL) {
+
+               ret = samldb_check_rdn(module, ac->req->op.add.message->dn);
+               if (ret != LDB_SUCCESS) {
+                       talloc_free(ac);
+                       return ret;
                }
+
+               return samldb_fill_object(ac, "user");
+       }
+
+       if (samdb_find_attribute(module->ldb, ac->msg,
+                                "objectclass", "group") != NULL) {
+
+               ret = samldb_check_rdn(module, ac->req->op.add.message->dn);
+               if (ret != LDB_SUCCESS) {
+                       talloc_free(ac);
+                       return ret;
+               }
+
+               return samldb_fill_object(ac, "group");
        }
 
        /* perhaps a foreignSecurityPrincipal? */
-       if ( ! msg2 ) {
-               if (samdb_find_attribute(module->ldb, msg, "objectclass", "foreignSecurityPrincipal") != NULL) {
-                       ret = samldb_fill_foreignSecurityPrincipal_object(module, msg, &msg2);
-                       if (ret) {
-                               return ret;
-                       }
+       if (samdb_find_attribute(module->ldb, ac->msg,
+                                "objectclass",
+                                "foreignSecurityPrincipal") != NULL) {
+
+               ret = samldb_check_rdn(module, ac->req->op.add.message->dn);
+               if (ret != LDB_SUCCESS) {
+                       talloc_free(ac);
+                       return ret;
                }
+
+               return samldb_fill_foreignSecurityPrincipal_object(ac);
        }
 
-       if (msg2 == NULL) {
+       talloc_free(ac);
+
+       /* nothing matched, go on */
+       return ldb_next_request(module, req);
+}
+
+/* modify */
+static int samldb_modify(struct ldb_module *module, struct ldb_request *req)
+{
+       struct ldb_message *msg;
+       struct ldb_message_element *el, *el2;
+       int ret;
+       unsigned int group_type, user_account_control, account_type;
+       if (ldb_dn_is_special(req->op.mod.message->dn)) { /* do not manipulate our control entries */
                return ldb_next_request(module, req);
        }
 
-       down_req = talloc(req, struct ldb_request);
-       if (down_req == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
+       if (ldb_msg_find_element(req->op.mod.message, "sAMAccountType") != NULL) {
+               ldb_asprintf_errstring(module->ldb, "sAMAccountType must not be specified");
+               return LDB_ERR_UNWILLING_TO_PERFORM;
        }
 
-       *down_req = *req;
-       
-       down_req->op.add.message = talloc_steal(down_req, msg2);
-
-       ldb_set_timeout_from_prev_req(module->ldb, req, down_req);
+       /* TODO: do not modify original request, create a new one */
 
-       /* go on with the call chain */
-       ret = ldb_next_request(module, down_req);
+       el = ldb_msg_find_element(req->op.mod.message, "groupType");
+       if (el && el->flags & (LDB_FLAG_MOD_ADD|LDB_FLAG_MOD_REPLACE) && el->num_values == 1) {
+               req->op.mod.message = msg = ldb_msg_copy_shallow(req, req->op.mod.message);
 
-       /* do not free down_req as the call results may be linked to it,
-        * it will be freed when the upper level request get freed */
-       if (ret == LDB_SUCCESS) {
-               req->handle = down_req->handle;
+               group_type = strtoul((const char *)el->values[0].data, NULL, 0);
+               account_type =  samdb_gtype2atype(group_type);
+               ret = samdb_msg_add_uint(module->ldb, msg, msg,
+                                        "sAMAccountType",
+                                        account_type);
+               if (ret != LDB_SUCCESS) {
+                       return ret;
+               }
+               el2 = ldb_msg_find_element(msg, "sAMAccountType");
+               el2->flags = LDB_FLAG_MOD_REPLACE;
        }
 
-       return ret;
+       el = ldb_msg_find_element(req->op.mod.message, "userAccountControl");
+       if (el && el->flags & (LDB_FLAG_MOD_ADD|LDB_FLAG_MOD_REPLACE) && el->num_values == 1) {
+               req->op.mod.message = msg = ldb_msg_copy_shallow(req, req->op.mod.message);
+
+               user_account_control = strtoul((const char *)el->values[0].data, NULL, 0);
+               account_type = samdb_uf2atype(user_account_control);
+               ret = samdb_msg_add_uint(module->ldb, msg, msg,
+                                        "sAMAccountType",
+                                        account_type);
+               if (ret != LDB_SUCCESS) {
+                       return ret;
+               }
+               el2 = ldb_msg_find_element(msg, "sAMAccountType");
+               el2->flags = LDB_FLAG_MOD_REPLACE;
+       }
+       return ldb_next_request(module, req);
 }
 
+
 static int samldb_init(struct ldb_module *module)
 {
        return ldb_next_init(module);
 }
 
-static const struct ldb_module_ops samldb_ops = {
+_PUBLIC_ const struct ldb_module_ops ldb_samldb_module_ops = {
        .name          = "samldb",
        .init_context  = samldb_init,
        .add           = samldb_add,
+       .modify        = samldb_modify
 };
-
-
-int samldb_module_init(void)
-{
-       return ldb_register_module(&samldb_ops);
-}