s4:samldb LDB module - "samldb_check_primaryGroupID" - support RID derivation from...
[samba.git] / source4 / dsdb / samdb / ldb_modules / samldb.c
index e657381e9654d0d1187173b8af87976f2c5297e9..7fa27e8a91fae6d8fbba60a9db4c1f14c8fd2b53 100644 (file)
@@ -59,15 +59,8 @@ struct samldb_ctx {
        /* the resulting message */
        struct ldb_message *msg;
 
-       /* holds the entry SID */
-       struct dom_sid *sid;
-
-       /* holds a generic dn */
-       struct ldb_dn *dn;
-
-       /* used in conjunction with "sid" in "samldb_dn_from_sid" and
-        * "samldb_find_for_defaultObjectCategory" */
-       struct ldb_dn *res_dn;
+       /* used in "samldb_find_for_defaultObjectCategory" */
+       struct ldb_dn *dn, *res_dn;
 
        /* all the async steps necessary to complete the operation */
        struct samldb_step *steps;
@@ -149,7 +142,10 @@ static int samldb_next_step(struct samldb_ctx *ac)
        }
 }
 
-static int samldb_generate_samAccountName(struct ldb_context *ldb, struct ldb_message *msg)
+
+/* sAMAccountName handling */
+
+static int samldb_generate_sAMAccountName(struct ldb_context *ldb, struct ldb_message *msg)
 {
        char *name;
 
@@ -162,96 +158,42 @@ static int samldb_generate_samAccountName(struct ldb_context *ldb, struct ldb_me
        if (name == NULL) {
                return ldb_oom(ldb);
        }
-       return ldb_msg_add_steal_string(msg, "samAccountName", name);
+       return ldb_msg_add_steal_string(msg, "sAMAccountName", name);
 }
 
-/*
- * samldb_check_samAccountName (async)
- */
-
-static int samldb_check_samAccountName_callback(struct ldb_request *req,
-                                               struct ldb_reply *ares)
+static int samldb_check_sAMAccountName(struct samldb_ctx *ac)
 {
-       struct samldb_ctx *ac;
-       int ret;
-
-       ac = talloc_get_type(req->context, struct samldb_ctx);
-
-       if (ares->error != LDB_SUCCESS) {
-               return ldb_module_done(ac->req, ares->controls,
-                                       ares->response, ares->error);
-       }
-
-       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;
-       }
-
-       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_context *ldb;
-       struct ldb_request *req;
+       struct ldb_context *ldb = ldb_module_get_ctx(ac->module);
        const char *name;
-       char *filter;
         int ret;
 
-       ldb = ldb_module_get_ctx(ac->module);
-
-        if (ldb_msg_find_element(ac->msg, "samAccountName") == NULL) {
-                ret = samldb_generate_samAccountName(ldb, ac->msg);
+        if (ldb_msg_find_element(ac->msg, "sAMAccountName") == NULL) {
+                ret = samldb_generate_sAMAccountName(ldb, ac->msg);
                 if (ret != LDB_SUCCESS) {
                         return ret;
                 }
         }
 
-       name = ldb_msg_find_attr_as_string(ac->msg, "samAccountName", NULL);
+       name = ldb_msg_find_attr_as_string(ac->msg, "sAMAccountName", NULL);
        if (name == NULL) {
                return ldb_operr(ldb);
        }
-       filter = talloc_asprintf(ac, "samAccountName=%s",
+
+       ret = samdb_search_count(ldb, NULL, "(sAMAccountName=%s)",
                                 ldb_binary_encode_string(ac, name));
-       if (filter == NULL) {
+       if ((ret < 0) || (ret > 1)) {
                return ldb_operr(ldb);
        }
-
-       ret = ldb_build_search_req(&req, ldb, ac,
-                                  ldb_get_default_basedn(ldb),
-                                  LDB_SCOPE_SUBTREE,
-                                  filter, NULL,
-                                  NULL,
-                                  ac, samldb_check_samAccountName_callback,
-                                  ac->req);
-       talloc_free(filter);
-       if (ret != LDB_SUCCESS) {
-               return ret;
+       if (ret == 1) {
+               return LDB_ERR_ENTRY_ALREADY_EXISTS;
        }
-       return ldb_next_request(ac->module, req);
+
+       return samldb_next_step(ac);
 }
 
+/* sAMAccountType handling */
 
-static int samldb_check_samAccountType(struct samldb_ctx *ac)
+static int samldb_check_sAMAccountType(struct samldb_ctx *ac)
 {
        struct ldb_context *ldb;
        unsigned int account_type;
@@ -284,9 +226,7 @@ static int samldb_check_samAccountType(struct samldb_ctx *ac)
                                return ret;
                        }
                }
-       } else
-       if (strcmp("group", ac->type) == 0) {
-
+       } else if (strcmp("group", ac->type) == 0) {
                group_type = samdb_result_uint(ac->msg, "groupType", 0);
                if (group_type == 0) {
                        ldb_asprintf_errstring(ldb,
@@ -307,6 +247,48 @@ static int samldb_check_samAccountType(struct samldb_ctx *ac)
        return samldb_next_step(ac);
 }
 
+/* primaryGroupID handling */
+
+static int samldb_check_primaryGroupID(struct samldb_ctx *ac)
+{
+       struct ldb_context *ldb = ldb_module_get_ctx(ac->module);
+       struct ldb_dn *prim_group_dn;
+       uint32_t rid;
+       struct dom_sid *sid;
+       int ret;
+
+       rid = samdb_result_uint(ac->msg, "primaryGroupID", (uint32_t) -1);
+       if (rid == (uint32_t) -1) {
+               uint32_t uac = samdb_result_uint(ac->msg, "userAccountControl",
+                                                0);
+
+               rid = ds_uf2prim_group_rid(uac);
+
+               ret = samdb_msg_add_uint(ldb, ac->msg, ac->msg,
+                                        "primaryGroupID", rid);
+               if (ret != LDB_SUCCESS) {
+                       return ret;
+               }
+       }
+
+       sid = dom_sid_add_rid(ac, samdb_domain_sid(ldb), rid);
+       if (sid == NULL) {
+               return ldb_operr(ldb);
+       }
+
+       prim_group_dn = samdb_search_dn(ldb, ac, NULL, "(objectSID=%s)",
+                                       dom_sid_string(ac, sid));
+       if (prim_group_dn == NULL) {
+               ldb_asprintf_errstring(ldb,
+                                      "Failed to find primary group with RID %u!",
+                                      rid);
+               return LDB_ERR_UNWILLING_TO_PERFORM;
+       }
+
+       return samldb_next_step(ac);
+}
+
+
 static bool samldb_msg_add_sid(struct ldb_message *msg,
                                const char *name,
                                const struct dom_sid *sid)
@@ -327,20 +309,21 @@ static bool samldb_msg_add_sid(struct ldb_message *msg,
 static int samldb_allocate_sid(struct samldb_ctx *ac)
 {
        uint32_t rid;
-       int ret;
+       struct dom_sid *sid;
        struct ldb_context *ldb = ldb_module_get_ctx(ac->module);
+       int ret;
 
        ret = ridalloc_allocate_rid(ac->module, &rid);
        if (ret != LDB_SUCCESS) {
                return ret;
        }
 
-       ac->sid = dom_sid_add_rid(ac, samdb_domain_sid(ldb), rid);
-       if (ac->sid == NULL) {
+       sid = dom_sid_add_rid(ac, samdb_domain_sid(ldb), rid);
+       if (sid == NULL) {
                return ldb_module_oom(ac->module);
        }
 
-       if ( ! samldb_msg_add_sid(ac->msg, "objectSid", ac->sid)) {
+       if ( ! samldb_msg_add_sid(ac->msg, "objectSid", sid)) {
                return ldb_operr(ldb);
        }
 
@@ -410,7 +393,7 @@ found:
                return ldb_operr(ldb);
        }
 
-       ret = ldb_msg_add_fmt(ac->msg, "samAccountName", "krbtgt_%u", krbtgt_number);
+       ret = ldb_msg_add_fmt(ac->msg, "sAMAccountName", "krbtgt_%u", krbtgt_number);
        if (ret != LDB_SUCCESS) {
                return ldb_operr(ldb);
        }
@@ -418,233 +401,37 @@ found:
        return samldb_next_step(ac);
 }
 
-/*
- * samldb_dn_from_sid (async)
- */
-
-static int samldb_dn_from_sid(struct samldb_ctx *ac);
-
-static int samldb_dn_from_sid_callback(struct ldb_request *req,
-       struct ldb_reply *ares)
-{
-       struct ldb_context *ldb;
-       struct samldb_ctx *ac;
-       int ret;
-
-       ac = talloc_get_type(req->context, struct samldb_ctx);
-       ldb = ldb_module_get_ctx(ac->module);
-
-       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->res_dn != NULL) {
-                       /* one too many! */
-                       ldb_set_errstring(ldb,
-                               "Invalid number of results while searching "
-                               "for domain objects!");
-                       ret = LDB_ERR_OPERATIONS_ERROR;
-                       break;
-               }
-               ac->res_dn = ldb_dn_copy(ac, ares->message->dn);
-
-               talloc_free(ares);
-               ret = LDB_SUCCESS;
-               break;
-
-       case LDB_REPLY_REFERRAL:
-               /* ignore */
-               talloc_free(ares);
-               ret = LDB_SUCCESS;
-               break;
-
-       case LDB_REPLY_DONE:
-               talloc_free(ares);
-
-               /* found or not 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;
-}
-
-/* Finds the DN "res_dn" of an object with a given SID "sid" */
-static int samldb_dn_from_sid(struct samldb_ctx *ac)
-{
-       struct ldb_context *ldb;
-       static const char * const attrs[] = { NULL };
-       struct ldb_request *req;
-       char *filter;
-       int ret;
-
-       ldb = ldb_module_get_ctx(ac->module);
-
-       if (ac->sid == NULL)
-               return ldb_operr(ldb);
-
-       filter = talloc_asprintf(ac, "(objectSid=%s)",
-               ldap_encode_ndr_dom_sid(ac, ac->sid));
-       if (filter == NULL)
-               return ldb_oom(ldb);
-
-       ret = ldb_build_search_req(&req, ldb, ac,
-                               ldb_get_default_basedn(ldb),
-                               LDB_SCOPE_SUBTREE,
-                               filter, attrs,
-                               NULL,
-                               ac, samldb_dn_from_sid_callback,
-                               ac->req);
-       if (ret != LDB_SUCCESS)
-               return ret;
-
-       return ldb_next_request(ac->module, req);
-}
-
-
-static int samldb_check_primaryGroupID_1(struct samldb_ctx *ac)
-{
-       struct ldb_context *ldb;
-       uint32_t rid;
-
-       ldb = ldb_module_get_ctx(ac->module);
-
-       rid = samdb_result_uint(ac->msg, "primaryGroupID", ~0);
-       ac->sid = dom_sid_add_rid(ac, samdb_domain_sid(ldb), rid);
-       if (ac->sid == NULL)
-               return ldb_operr(ldb);
-       ac->res_dn = NULL;
-
-       return samldb_next_step(ac);
-}
-
-static int samldb_check_primaryGroupID_2(struct samldb_ctx *ac)
-{
-       if (ac->res_dn == NULL) {
-               struct ldb_context *ldb;
-               ldb = ldb_module_get_ctx(ac->module);
-               ldb_asprintf_errstring(ldb,
-                                      "Failed to find group sid %s!",
-                                      dom_sid_string(ac->sid, ac->sid));
-               return LDB_ERR_UNWILLING_TO_PERFORM;
-       }
-
-       return samldb_next_step(ac);
-}
-
-
-/*
- * samldb_find_for_defaultObjectCategory (async)
- */
-
-static int samldb_find_for_defaultObjectCategory_callback(struct ldb_request *req,
-                                                         struct ldb_reply *ares)
-{
-       struct ldb_context *ldb;
-       struct samldb_ctx *ac;
-       int ret;
-
-       ac = talloc_get_type(req->context, struct samldb_ctx);
-       ldb = ldb_module_get_ctx(ac->module);
-
-       if (!ares) {
-               ret = LDB_ERR_OPERATIONS_ERROR;
-               goto done;
-       }
-       if (ares->error != LDB_SUCCESS) {
-               if (ares->error == LDB_ERR_NO_SUCH_OBJECT) {
-                       if (ldb_request_get_control(ac->req,
-                                                   LDB_CONTROL_RELAX_OID) != NULL) {
-                               /* Don't be pricky when the DN doesn't exist */
-                               /* if we have the RELAX control specified */
-                               ac->res_dn = req->op.search.base;
-                               return samldb_next_step(ac);
-                       } else {
-                               ldb_set_errstring(ldb,
-                                       "samldb_find_defaultObjectCategory: "
-                                       "Invalid DN for 'defaultObjectCategory'!");
-                               ares->error = LDB_ERR_CONSTRAINT_VIOLATION;
-                       }
-               }
-
-               return ldb_module_done(ac->req, ares->controls,
-                                       ares->response, ares->error);
-       }
-
-       switch (ares->type) {
-       case LDB_REPLY_ENTRY:
-               ac->res_dn = talloc_steal(ac, ares->message->dn);
-
-               ret = LDB_SUCCESS;
-               break;
-
-       case LDB_REPLY_REFERRAL:
-               /* ignore */
-               talloc_free(ares);
-               ret = LDB_SUCCESS;
-               break;
-
-       case LDB_REPLY_DONE:
-               talloc_free(ares);
-
-               if (ac->res_dn != NULL) {
-                       /* when found go on */
-                       ret = samldb_next_step(ac);
-               } else {
-                       ret = LDB_ERR_OPERATIONS_ERROR;
-               }
-               break;
-       }
-
-done:
-       if (ret != LDB_SUCCESS) {
-               return ldb_module_done(ac->req, NULL, NULL, ret);
-       }
-
-       return LDB_SUCCESS;
-}
-
 static int samldb_find_for_defaultObjectCategory(struct samldb_ctx *ac)
 {
-       struct ldb_context *ldb;
-       struct ldb_request *req;
-       static const char *no_attrs[] = { NULL };
+       struct ldb_context *ldb = ldb_module_get_ctx(ac->module);
+       struct ldb_result *res;
+       const char *no_attrs[] = { NULL };
         int ret;
 
-       ldb = ldb_module_get_ctx(ac->module);
-
        ac->res_dn = NULL;
 
-       ret = ldb_build_search_req(&req, ldb, ac,
-                                  ac->dn, LDB_SCOPE_BASE,
-                                  "(objectClass=classSchema)", no_attrs,
-                                  NULL, ac,
-                                  samldb_find_for_defaultObjectCategory_callback,
-                                  ac->req);
-       if (ret != LDB_SUCCESS) {
-               return ret;
+       ret = dsdb_module_search(ac->module, ac, &res,
+                                ac->dn, LDB_SCOPE_BASE, no_attrs,
+                                DSDB_SEARCH_SHOW_DN_IN_STORAGE_FORMAT | DSDB_FLAG_NEXT_MODULE,
+                                "(objectClass=classSchema)");
+       if (ret == LDB_ERR_NO_SUCH_OBJECT) {
+               /* Don't be pricky when the DN doesn't exist if we have the */
+               /* RELAX control specified */
+               if (ldb_request_get_control(ac->req,
+                                           LDB_CONTROL_RELAX_OID) == NULL) {
+                       ldb_set_errstring(ldb,
+                                         "samldb_find_defaultObjectCategory: "
+                                         "Invalid DN for 'defaultObjectCategory'!");
+                       return LDB_ERR_CONSTRAINT_VIOLATION;
+               }
        }
-
-       ret = dsdb_request_add_controls(req,
-                                       DSDB_SEARCH_SHOW_DN_IN_STORAGE_FORMAT);
-       if (ret != LDB_SUCCESS) {
+       if ((ret != LDB_ERR_NO_SUCH_OBJECT) && (ret != LDB_SUCCESS)) {
                return ret;
        }
 
-       return ldb_next_request(ac->module, req);
+       ac->res_dn = ac->dn;
+
+       return samldb_next_step(ac);
 }
 
 /**
@@ -816,6 +603,7 @@ static int samldb_fill_object(struct samldb_ctx *ac, const char *type)
        enum sid_generator sid_generator;
        int ret;
        struct ldb_control *rodc_control;
+       struct dom_sid *sid;
 
        ldb = ldb_module_get_ctx(ac->module);
 
@@ -846,11 +634,6 @@ static int samldb_fill_object(struct samldb_ctx *ac, const char *type)
                ret = samdb_find_or_add_attribute(ldb, ac->msg,
                        "pwdLastSet", "0");
                if (ret != LDB_SUCCESS) return ret;
-               if (!ldb_msg_find_element(ac->msg, "primaryGroupID")) {
-                       ret = samdb_msg_add_uint(ldb, ac->msg, ac->msg,
-                                                "primaryGroupID", DOMAIN_RID_USERS);
-                       if (ret != LDB_SUCCESS) return ret;
-               }
                ret = samdb_find_or_add_attribute(ldb, ac->msg,
                        "accountExpires", "9223372036854775807");
                if (ret != LDB_SUCCESS) return ret;
@@ -999,21 +782,17 @@ static int samldb_fill_object(struct samldb_ctx *ac, const char *type)
                if (ret != LDB_SUCCESS) return ret;
        }
 
-       /* check if we have a valid samAccountName */
-       ret = samldb_add_step(ac, samldb_check_samAccountName);
+       /* 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);
+       ret = samldb_add_step(ac, samldb_check_sAMAccountType);
        if (ret != LDB_SUCCESS) return ret;
 
        /* check if we have a valid primary group ID */
        if (strcmp(ac->type, "user") == 0) {
-               ret = samldb_add_step(ac, samldb_check_primaryGroupID_1);
-               if (ret != LDB_SUCCESS) return ret;
-               ret = samldb_add_step(ac, samldb_dn_from_sid);
-               if (ret != LDB_SUCCESS) return ret;
-               ret = samldb_add_step(ac, samldb_check_primaryGroupID_2);
+               ret = samldb_add_step(ac, samldb_check_primaryGroupID);
                if (ret != LDB_SUCCESS) return ret;
        }
 
@@ -1021,15 +800,15 @@ static int samldb_fill_object(struct samldb_ctx *ac, const char *type)
                 struct loadparm_context);
 
        /* don't allow objectSID to be specified without the RELAX control */
-       ac->sid = samdb_result_dom_sid(ac, ac->msg, "objectSid");
-       if (ac->sid && !ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID) &&
+       sid = samdb_result_dom_sid(ac, ac->msg, "objectSid");
+       if (sid && !ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID) &&
            !dsdb_module_am_system(ac->module)) {
                ldb_asprintf_errstring(ldb, "No SID may be specified in user/group creation for %s",
                                       ldb_dn_get_linearized(ac->msg->dn));
                return LDB_ERR_UNWILLING_TO_PERFORM;
        }
 
-       if ( ! ac->sid) {
+       if (sid == NULL) {
                sid_generator = lpcfg_sid_generator(lp_ctx);
                if (sid_generator == SID_GENERATOR_INTERNAL) {
                        ret = samldb_add_step(ac, samldb_allocate_sid);
@@ -1047,23 +826,22 @@ static int samldb_fill_object(struct samldb_ctx *ac, const char *type)
 static int samldb_fill_foreignSecurityPrincipal_object(struct samldb_ctx *ac)
 {
        struct ldb_context *ldb;
+       struct dom_sid *sid;
        int ret;
 
        ldb = ldb_module_get_ctx(ac->module);
 
-       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) {
+       sid = samdb_result_dom_sid(ac->msg, ac->msg, "objectSid");
+       if (sid == NULL) {
+               sid = dom_sid_parse_talloc(ac->msg,
+                                          (const char *)ldb_dn_get_rdn_val(ac->msg->dn)->data);
+               if (sid == NULL) {
                        ldb_set_errstring(ldb,
                                        "No valid SID found in "
                                        "ForeignSecurityPrincipal CN!");
-                       talloc_free(ac);
                        return LDB_ERR_CONSTRAINT_VIOLATION;
                }
-               if ( ! samldb_msg_add_sid(ac->msg, "objectSid", ac->sid)) {
-                       talloc_free(ac);
+               if (! samldb_msg_add_sid(ac->msg, "objectSid", sid)) {
                        return ldb_operr(ldb);
                }
        }
@@ -1278,47 +1056,6 @@ static int samldb_member_check(struct samldb_ctx *ac)
 }
 
 
-static int samldb_prim_group_users_check(struct samldb_ctx *ac)
-{
-       struct ldb_context *ldb;
-       struct dom_sid *sid;
-       uint32_t rid;
-       NTSTATUS status;
-       int count;
-
-       ldb = ldb_module_get_ctx(ac->module);
-
-       /* Finds out the SID/RID of the SAM object */
-       sid = samdb_search_dom_sid(ldb, ac, ac->req->op.del.dn, "objectSID",
-                                  NULL);
-       if (sid == NULL) {
-               /* No SID - it might not be a SAM object - therefore ok */
-               return LDB_SUCCESS;
-       }
-       status = dom_sid_split_rid(ac, sid, NULL, &rid);
-       if (!NT_STATUS_IS_OK(status)) {
-               return ldb_operr(ldb);
-       }
-       if (rid == 0) {
-               /* Special object (security principal?) */
-               return LDB_SUCCESS;
-       }
-
-       /* Deny delete requests from groups which are primary ones */
-       count = samdb_search_count(ldb, NULL,
-                                  "(&(primaryGroupID=%u)(objectClass=user))",
-                                  rid);
-       if (count < 0) {
-               return ldb_operr(ldb);
-       }
-       if (count > 0) {
-               return LDB_ERR_ENTRY_ALREADY_EXISTS;
-       }
-
-       return LDB_SUCCESS;
-}
-
-
 /* add */
 static int samldb_add(struct ldb_module *module, struct ldb_request *req)
 {
@@ -1340,11 +1077,9 @@ static int samldb_add(struct ldb_module *module, struct ldb_request *req)
        }
 
        /* build the new msg */
-       ac->msg = ldb_msg_copy(ac, ac->req->op.add.message);
-       if (!ac->msg) {
-               talloc_free(ac);
-               ldb_debug(ldb, LDB_DEBUG_FATAL,
-                         "samldb_add: ldb_msg_copy failed!\n");
+       req->op.add.message = ac->msg = ldb_msg_copy_shallow(req,
+                                                            req->op.add.message);
+       if (ac->msg == NULL) {
                return ldb_operr(ldb);
        }
 
@@ -1398,7 +1133,6 @@ static int samldb_modify(struct ldb_module *module, struct ldb_request *req)
 {
        struct ldb_context *ldb;
        struct samldb_ctx *ac;
-       struct ldb_message *msg;
        struct ldb_message_element *el, *el2;
        int ret;
        uint32_t account_type;
@@ -1429,35 +1163,34 @@ static int samldb_modify(struct ldb_module *module, struct ldb_request *req)
                return ldb_operr(ldb);
        }
 
-       /* TODO: do not modify original request, create a new one */
+       /* build the new msg */
+       req->op.mod.message = ac->msg = ldb_msg_copy_shallow(req,
+                                                            req->op.mod.message);
+       if (ac->msg == NULL) {
+               return ldb_operr(ldb);
+       }
 
-       el = ldb_msg_find_element(req->op.mod.message, "groupType");
+       el = ldb_msg_find_element(ac->msg, "groupType");
        if (el && (LDB_FLAG_MOD_TYPE(el->flags) == LDB_FLAG_MOD_REPLACE) && el->num_values == 1) {
                uint32_t group_type;
 
-               req->op.mod.message = msg = ldb_msg_copy_shallow(req,
-                       req->op.mod.message);
-
                group_type = strtoul((const char *)el->values[0].data, NULL, 0);
                account_type =  ds_gtype2atype(group_type);
-               ret = samdb_msg_add_uint(ldb, msg, msg,
+               ret = samdb_msg_add_uint(ldb, ac->msg, ac->msg,
                                         "sAMAccountType",
                                         account_type);
                if (ret != LDB_SUCCESS) {
                        return ret;
                }
-               el2 = ldb_msg_find_element(msg, "sAMAccountType");
+               el2 = ldb_msg_find_element(ac->msg, "sAMAccountType");
                el2->flags = LDB_FLAG_MOD_REPLACE;
        }
        if (el && (LDB_FLAG_MOD_TYPE(el->flags) == LDB_FLAG_MOD_DELETE)) {
                return LDB_ERR_UNWILLING_TO_PERFORM;
        }
 
-       el = ldb_msg_find_element(req->op.mod.message, "primaryGroupID");
+       el = ldb_msg_find_element(ac->msg, "primaryGroupID");
        if (el && (LDB_FLAG_MOD_TYPE(el->flags) == LDB_FLAG_MOD_REPLACE) && el->num_values == 1) {
-               req->op.mod.message = ac->msg = ldb_msg_copy_shallow(req,
-                       req->op.mod.message);
-
                ret = samldb_prim_group_change(ac);
                if (ret != LDB_SUCCESS) {
                        return ret;
@@ -1467,36 +1200,35 @@ static int samldb_modify(struct ldb_module *module, struct ldb_request *req)
                return LDB_ERR_UNWILLING_TO_PERFORM;
        }
 
-       el = ldb_msg_find_element(req->op.mod.message, "userAccountControl");
+       el = ldb_msg_find_element(ac->msg, "userAccountControl");
        if (el && (LDB_FLAG_MOD_TYPE(el->flags) == LDB_FLAG_MOD_REPLACE) && el->num_values == 1) {
                uint32_t user_account_control;
 
-               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 = ds_uf2atype(user_account_control);
-               ret = samdb_msg_add_uint(ldb, msg, msg,
+               ret = samdb_msg_add_uint(ldb, ac->msg, ac->msg,
                                         "sAMAccountType",
                                         account_type);
                if (ret != LDB_SUCCESS) {
                        return ret;
                }
-               el2 = ldb_msg_find_element(msg, "sAMAccountType");
+               el2 = ldb_msg_find_element(ac->msg, "sAMAccountType");
                el2->flags = LDB_FLAG_MOD_REPLACE;
 
                if (user_account_control & (UF_SERVER_TRUST_ACCOUNT | UF_PARTIAL_SECRETS_ACCOUNT)) {
-                       ret = samdb_msg_add_string(ldb, msg, msg,
-                                                  "isCriticalSystemObject", "TRUE");
+                       ret = samdb_msg_add_string(ldb, ac->msg, ac->msg,
+                                                  "isCriticalSystemObject",
+                                                  "TRUE");
                        if (ret != LDB_SUCCESS) {
                                return ret;
                        }
-                       el2 = ldb_msg_find_element(msg, "isCriticalSystemObject");
+                       el2 = ldb_msg_find_element(ac->msg,
+                                                  "isCriticalSystemObject");
                        el2->flags = LDB_FLAG_MOD_REPLACE;
 
                        /* DCs have primaryGroupID of DOMAIN_RID_DCS */
-                       if (!ldb_msg_find_element(msg, "primaryGroupID")) {
+                       if (!ldb_msg_find_element(ac->msg, "primaryGroupID")) {
                                uint32_t rid;
                                if (user_account_control & UF_SERVER_TRUST_ACCOUNT) {
                                        rid = DOMAIN_RID_DCS;
@@ -1504,12 +1236,13 @@ static int samldb_modify(struct ldb_module *module, struct ldb_request *req)
                                        /* read-only DC */
                                        rid = DOMAIN_RID_READONLY_DCS;
                                }
-                               ret = samdb_msg_add_uint(ldb, msg, msg,
+                               ret = samdb_msg_add_uint(ldb, ac->msg, ac->msg,
                                                         "primaryGroupID", rid);
                                if (ret != LDB_SUCCESS) {
                                        return ret;
                                }
-                               el2 = ldb_msg_find_element(msg, "primaryGroupID");
+                               el2 = ldb_msg_find_element(ac->msg,
+                                                          "primaryGroupID");
                                el2->flags = LDB_FLAG_MOD_REPLACE;
                        }
                }
@@ -1518,21 +1251,61 @@ static int samldb_modify(struct ldb_module *module, struct ldb_request *req)
                return LDB_ERR_UNWILLING_TO_PERFORM;
        }
 
-       el = ldb_msg_find_element(req->op.mod.message, "member");
+       el = ldb_msg_find_element(ac->msg, "member");
        if (el && el->flags & (LDB_FLAG_MOD_ADD|LDB_FLAG_MOD_REPLACE) && el->num_values == 1) {
-               req->op.mod.message = ac->msg = ldb_msg_copy_shallow(req,
-                       req->op.mod.message);
-
                ret = samldb_member_check(ac);
                if (ret != LDB_SUCCESS) {
                        return ret;
                }
        }
 
+       talloc_free(ac);
+
        return ldb_next_request(module, req);
 }
 
 /* delete */
+
+static int samldb_prim_group_users_check(struct samldb_ctx *ac)
+{
+       struct ldb_context *ldb;
+       struct dom_sid *sid;
+       uint32_t rid;
+       NTSTATUS status;
+       int count;
+
+       ldb = ldb_module_get_ctx(ac->module);
+
+       /* Finds out the SID/RID of the SAM object */
+       sid = samdb_search_dom_sid(ldb, ac, ac->req->op.del.dn, "objectSID",
+                                  NULL);
+       if (sid == NULL) {
+               /* No SID - it might not be a SAM object - therefore ok */
+               return LDB_SUCCESS;
+       }
+       status = dom_sid_split_rid(ac, sid, NULL, &rid);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ldb_operr(ldb);
+       }
+       if (rid == 0) {
+               /* Special object (security principal?) */
+               return LDB_SUCCESS;
+       }
+
+       /* Deny delete requests from groups which are primary ones */
+       count = samdb_search_count(ldb, NULL,
+                                  "(&(primaryGroupID=%u)(objectClass=user))",
+                                  rid);
+       if (count < 0) {
+               return ldb_operr(ldb);
+       }
+       if (count > 0) {
+               return LDB_ERR_ENTRY_ALREADY_EXISTS;
+       }
+
+       return LDB_SUCCESS;
+}
+
 static int samldb_delete(struct ldb_module *module, struct ldb_request *req)
 {
        struct samldb_ctx *ac;
@@ -1544,17 +1317,22 @@ static int samldb_delete(struct ldb_module *module, struct ldb_request *req)
        }
 
        ac = samldb_ctx_init(module, req);
-       if (ac == NULL)
+       if (ac == NULL) {
                return ldb_operr(ldb_module_get_ctx(module));
+       }
 
        ret = samldb_prim_group_users_check(ac);
        if (ret != LDB_SUCCESS) {
                return ret;
        }
 
+       talloc_free(ac);
+
        return ldb_next_request(module, req);
 }
 
+/* extended */
+
 static int samldb_extended_allocate_rid_pool(struct ldb_module *module, struct ldb_request *req)
 {
        struct ldb_context *ldb = ldb_module_get_ctx(module);