s4:dsdb/descriptor: skip duplicates in descriptor_extended_sec_desc_propagation()
[samba.git] / source4 / dsdb / samdb / ldb_modules / descriptor.c
index da80ee540ed698ac6510c2e7c5748a05f867794d..f27a615196069888ee91ed7da0f766c803ed97dd 100644 (file)
  */
 
 #include "includes.h"
-#include "ldb_module.h"
-#include "dlinklist.h"
+#include <ldb_module.h>
+#include "util/dlinklist.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/security.h"
 #include "auth/auth.h"
 #include "param/param.h"
+#include "dsdb/samdb/ldb_modules/util.h"
+#include "lib/util/util_tdb.h"
+#include "lib/dbwrap/dbwrap.h"
+#include "lib/dbwrap/dbwrap_rbt.h"
+
+struct descriptor_changes {
+       struct descriptor_changes *prev, *next;
+       struct ldb_dn *nc_root;
+       struct GUID guid;
+       bool force_self;
+       bool force_children;
+       struct ldb_dn *stopped_dn;
+       size_t ref_count;
+};
+
+struct descriptor_transaction {
+       TALLOC_CTX *mem;
+       struct {
+               /*
+                * We used to have a list of changes, appended with each
+                * DSDB_EXTENDED_SEC_DESC_PROPAGATION_OID operation.
+                *
+                * But the main problem was that a replication
+                * cycle (mainly the initial replication) calls
+                * DSDB_EXTENDED_SEC_DESC_PROPAGATION_OID for the
+                * same object[GUID] more than once. With
+                * DRSUAPI_DRS_GET_TGT we'll get the naming
+                * context head object and other top level
+                * containers, every often.
+                *
+                * It means we'll process objects more
+                * than once and waste a lot of time
+                * doing the same work again and again.
+                *
+                * We use an objectGUID based map in order to
+                * avoid registering objects more than once.
+                * In an domain with 22000 object it can
+                * reduce the work from 4 hours down to ~ 3.5 minutes.
+                */
+               struct descriptor_changes *list;
+               struct db_context *map;
+               size_t num_registrations;
+               size_t num_registered;
+               size_t num_processed;
+       } changes;
+       struct {
+               size_t num_processed;
+       } objects;
+};
 
 struct descriptor_data {
-       int _dummy;
+       struct descriptor_transaction transaction;
 };
 
 struct descriptor_context {
        struct ldb_module *module;
        struct ldb_request *req;
+       struct ldb_message *msg;
        struct ldb_reply *search_res;
        struct ldb_reply *search_oc_res;
        struct ldb_val *parentsd_val;
+       struct ldb_message_element *sd_element;
        struct ldb_val *sd_val;
+       uint32_t sd_flags;
        int (*step_fn)(struct descriptor_context *);
 };
 
-static const struct dsdb_class * get_last_structural_class(const struct dsdb_schema *schema, struct ldb_message_element *element)
-{
-       const struct dsdb_class *last_class = NULL;
-       int i;
-       for (i = 0; i < element->num_values; i++){
-               if (!last_class) {
-                       last_class = dsdb_class_by_lDAPDisplayName_ldb_val(schema, &element->values[i]);
-               } else {
-                       const struct dsdb_class *tmp_class = dsdb_class_by_lDAPDisplayName_ldb_val(schema, &element->values[i]);
-                       if (tmp_class->subClass_order > last_class->subClass_order)
-                               last_class = tmp_class;
-               }
-       }
-       return last_class;
-}
-
-struct dom_sid *get_default_ag(TALLOC_CTX *mem_ctx,
+static struct dom_sid *get_default_ag(TALLOC_CTX *mem_ctx,
                               struct ldb_dn *dn,
                               struct security_token *token,
                               struct ldb_context *ldb)
 {
        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
-       struct ldb_dn *root_base_dn = ldb_get_root_basedn(ldb);
-       struct ldb_dn *schema_base_dn = ldb_get_schema_basedn(ldb);
-       struct ldb_dn *config_base_dn = ldb_get_config_basedn(ldb);
        const struct dom_sid *domain_sid = samdb_domain_sid(ldb);
        struct dom_sid *da_sid = dom_sid_add_rid(tmp_ctx, domain_sid, DOMAIN_RID_ADMINS);
        struct dom_sid *ea_sid = dom_sid_add_rid(tmp_ctx, domain_sid, DOMAIN_RID_ENTERPRISE_ADMINS);
        struct dom_sid *sa_sid = dom_sid_add_rid(tmp_ctx, domain_sid, DOMAIN_RID_SCHEMA_ADMINS);
        struct dom_sid *dag_sid;
+       struct ldb_dn *nc_root;
+       int ret;
+
+       ret = dsdb_find_nc_root(ldb, tmp_ctx, dn, &nc_root);
+       if (ret != LDB_SUCCESS) {
+               talloc_free(tmp_ctx);
+               return NULL;
+       }
 
-       if (ldb_dn_compare_base(schema_base_dn, dn) == 0){
-               if (security_token_has_sid(token, sa_sid))
+       if (ldb_dn_compare(nc_root, ldb_get_schema_basedn(ldb)) == 0) {
+               if (security_token_has_sid(token, sa_sid)) {
                        dag_sid = dom_sid_dup(mem_ctx, sa_sid);
-               else if (security_token_has_sid(token, ea_sid))
+               } else if (security_token_has_sid(token, ea_sid)) {
                        dag_sid = dom_sid_dup(mem_ctx, ea_sid);
-               else if (security_token_has_sid(token, da_sid))
+               } else if (security_token_has_sid(token, da_sid)) {
                        dag_sid = dom_sid_dup(mem_ctx, da_sid);
-               else
+               } else if (security_token_is_system(token)) {
+                       dag_sid = dom_sid_dup(mem_ctx, sa_sid);
+               } else {
                        dag_sid = NULL;
-       }
-       else if (ldb_dn_compare_base(config_base_dn, dn) == 0){
-               if (security_token_has_sid(token, ea_sid))
+               }
+       } else if (ldb_dn_compare(nc_root, ldb_get_config_basedn(ldb)) == 0) {
+               if (security_token_has_sid(token, ea_sid)) {
                        dag_sid = dom_sid_dup(mem_ctx, ea_sid);
-               else if (security_token_has_sid(token, da_sid))
+               } else if (security_token_has_sid(token, da_sid)) {
                        dag_sid = dom_sid_dup(mem_ctx, da_sid);
-               else
+               } else if (security_token_is_system(token)) {
+                       dag_sid = dom_sid_dup(mem_ctx, ea_sid);
+               } else {
                        dag_sid = NULL;
-       }
-       else if (ldb_dn_compare_base(root_base_dn, dn) == 0){
-               if (security_token_has_sid(token, da_sid))
+               }
+       } else if (ldb_dn_compare(nc_root, ldb_get_default_basedn(ldb)) == 0) {
+               if (security_token_has_sid(token, da_sid)) {
                        dag_sid = dom_sid_dup(mem_ctx, da_sid);
-               else if (security_token_has_sid(token, ea_sid))
+               } else if (security_token_has_sid(token, ea_sid)) {
                                dag_sid = dom_sid_dup(mem_ctx, ea_sid);
-               else
+               } else if (security_token_is_system(token)) {
+                       dag_sid = dom_sid_dup(mem_ctx, da_sid);
+               } else {
                        dag_sid = NULL;
-       }
-       else
+               }
+       } else {
                dag_sid = NULL;
+       }
 
        talloc_free(tmp_ctx);
        return dag_sid;
@@ -141,17 +189,16 @@ static struct dom_sid *get_default_group(TALLOC_CTX *mem_ctx,
                                         struct ldb_context *ldb,
                                         struct dom_sid *dag)
 {
-       int *domainFunctionality;
-
-       domainFunctionality = talloc_get_type(
-               ldb_get_opaque(ldb, "domainFunctionality"), int);
-
-       if (*domainFunctionality
-                       && (*domainFunctionality >= DS_DOMAIN_FUNCTION_2008)) {
-               return dag;
-       }
-
-       return NULL;
+       /*
+        * This depends on the function level of the DC
+        * which is 2008R2 in our case. Which means it is
+        * higher than 2003 and we should use the
+        * "default administrator group" also as owning group.
+        *
+        * This matches dcpromo for a 2003 domain
+        * on a Windows 2008R2 DC.
+        */
+       return dag;
 }
 
 static struct security_descriptor *descr_handle_sd_flags(TALLOC_CTX *mem_ctx,
@@ -170,20 +217,28 @@ static struct security_descriptor *descr_handle_sd_flags(TALLOC_CTX *mem_ctx,
        final_sd->type = SEC_DESC_SELF_RELATIVE;
 
        if (sd_flags & (SECINFO_OWNER)) {
-               final_sd->owner_sid = talloc_memdup(mem_ctx, new_sd->owner_sid, sizeof(struct dom_sid));
+               if (new_sd->owner_sid) {
+                       final_sd->owner_sid = talloc_memdup(mem_ctx, new_sd->owner_sid, sizeof(struct dom_sid));
+               }
                final_sd->type |= new_sd->type & SEC_DESC_OWNER_DEFAULTED;
        }
        else if (old_sd) {
-               final_sd->owner_sid = talloc_memdup(mem_ctx, old_sd->owner_sid, sizeof(struct dom_sid));
+               if (old_sd->owner_sid) {
+                       final_sd->owner_sid = talloc_memdup(mem_ctx, old_sd->owner_sid, sizeof(struct dom_sid));
+               }
                final_sd->type |= old_sd->type & SEC_DESC_OWNER_DEFAULTED;
        }
 
        if (sd_flags & (SECINFO_GROUP)) {
-               final_sd->group_sid = talloc_memdup(mem_ctx, new_sd->group_sid, sizeof(struct dom_sid));
+               if (new_sd->group_sid) {
+                       final_sd->group_sid = talloc_memdup(mem_ctx, new_sd->group_sid, sizeof(struct dom_sid));
+               }
                final_sd->type |= new_sd->type & SEC_DESC_GROUP_DEFAULTED;
        } 
        else if (old_sd) {
-               final_sd->group_sid = talloc_memdup(mem_ctx, old_sd->group_sid, sizeof(struct dom_sid));
+               if (old_sd->group_sid) {
+                       final_sd->group_sid = talloc_memdup(mem_ctx, old_sd->group_sid, sizeof(struct dom_sid));
+               }
                final_sd->type |= old_sd->type & SEC_DESC_GROUP_DEFAULTED;
        }
 
@@ -194,7 +249,7 @@ static struct security_descriptor *descr_handle_sd_flags(TALLOC_CTX *mem_ctx,
                        SEC_DESC_SACL_AUTO_INHERITED|SEC_DESC_SACL_PROTECTED |
                        SEC_DESC_SERVER_SECURITY);
        } 
-       else if (old_sd) {
+       else if (old_sd && old_sd->sacl) {
                final_sd->sacl = security_acl_dup(mem_ctx,old_sd->sacl);
                final_sd->type |= old_sd->type & (SEC_DESC_SACL_PRESENT |
                        SEC_DESC_SACL_DEFAULTED|SEC_DESC_SACL_AUTO_INHERIT_REQ |
@@ -209,7 +264,7 @@ static struct security_descriptor *descr_handle_sd_flags(TALLOC_CTX *mem_ctx,
                        SEC_DESC_DACL_AUTO_INHERITED|SEC_DESC_DACL_PROTECTED |
                        SEC_DESC_DACL_TRUSTED);
        } 
-       else if (old_sd) {
+       else if (old_sd && old_sd->dacl) {
                final_sd->dacl = security_acl_dup(mem_ctx,old_sd->dacl);
                final_sd->type |= old_sd->type & (SEC_DESC_DACL_PRESENT |
                        SEC_DESC_DACL_DEFAULTED|SEC_DESC_DACL_AUTO_INHERIT_REQ |
@@ -226,8 +281,8 @@ static DATA_BLOB *get_new_descriptor(struct ldb_module *module,
                                     TALLOC_CTX *mem_ctx,
                                     const struct dsdb_class *objectclass,
                                     const struct ldb_val *parent,
-                                    struct ldb_val *object,
-                                    struct ldb_val *old_sd,
+                                    const struct ldb_val *object,
+                                    const struct ldb_val *old_sd,
                                     uint32_t sd_flags)
 {
        struct security_descriptor *user_descriptor = NULL, *parent_descriptor = NULL;
@@ -237,18 +292,28 @@ static DATA_BLOB *get_new_descriptor(struct ldb_module *module,
        enum ndr_err_code ndr_err;
        struct ldb_context *ldb = ldb_module_get_ctx(module);
        struct auth_session_info *session_info
-               = ldb_get_opaque(ldb, "sessionInfo");
+               = ldb_get_opaque(ldb, DSDB_SESSION_INFO);
        const struct dom_sid *domain_sid = samdb_domain_sid(ldb);
-       char *sddl_sd;
        struct dom_sid *default_owner;
        struct dom_sid *default_group;
+       struct security_descriptor *default_descriptor = NULL;
+       struct GUID *object_list = NULL;
+
+       if (objectclass != NULL) {
+               default_descriptor = get_sd_unpacked(module, mem_ctx, objectclass);
+               object_list = talloc_zero_array(mem_ctx, struct GUID, 2);
+               if (object_list == NULL) {
+                       return NULL;
+               }
+               object_list[0] = objectclass->schemaIDGUID;
+       }
 
        if (object) {
                user_descriptor = talloc(mem_ctx, struct security_descriptor);
                if (!user_descriptor) {
                        return NULL;
                }
-               ndr_err = ndr_pull_struct_blob(object, user_descriptor, NULL,
+               ndr_err = ndr_pull_struct_blob(object, user_descriptor, 
                                               user_descriptor,
                                               (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
 
@@ -257,7 +322,7 @@ static DATA_BLOB *get_new_descriptor(struct ldb_module *module,
                        return NULL;
                }
        } else {
-               user_descriptor = get_sd_unpacked(module, mem_ctx, objectclass);
+               user_descriptor = default_descriptor;
        }
 
        if (old_sd) {
@@ -265,7 +330,7 @@ static DATA_BLOB *get_new_descriptor(struct ldb_module *module,
                if (!old_descriptor) {
                        return NULL;
                }
-               ndr_err = ndr_pull_struct_blob(old_sd, old_descriptor, NULL,
+               ndr_err = ndr_pull_struct_blob(old_sd, old_descriptor, 
                                               old_descriptor,
                                               (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
 
@@ -280,7 +345,7 @@ static DATA_BLOB *get_new_descriptor(struct ldb_module *module,
                if (!parent_descriptor) {
                        return NULL;
                }
-               ndr_err = ndr_pull_struct_blob(parent, parent_descriptor, NULL,
+               ndr_err = ndr_pull_struct_blob(parent, parent_descriptor, 
                                               parent_descriptor,
                                               (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
 
@@ -290,11 +355,82 @@ static DATA_BLOB *get_new_descriptor(struct ldb_module *module,
                }
        }
 
+       if (user_descriptor && default_descriptor &&
+           (user_descriptor->dacl == NULL))
+       {
+               user_descriptor->dacl = default_descriptor->dacl;
+               user_descriptor->type |= default_descriptor->type & (
+                       SEC_DESC_DACL_PRESENT |
+                       SEC_DESC_DACL_DEFAULTED|SEC_DESC_DACL_AUTO_INHERIT_REQ |
+                       SEC_DESC_DACL_AUTO_INHERITED|SEC_DESC_DACL_PROTECTED |
+                       SEC_DESC_DACL_TRUSTED);
+       }
+
+       if (user_descriptor && default_descriptor &&
+           (user_descriptor->sacl == NULL))
+       {
+               user_descriptor->sacl = default_descriptor->sacl;
+               user_descriptor->type |= default_descriptor->type & (
+                       SEC_DESC_SACL_PRESENT |
+                       SEC_DESC_SACL_DEFAULTED|SEC_DESC_SACL_AUTO_INHERIT_REQ |
+                       SEC_DESC_SACL_AUTO_INHERITED|SEC_DESC_SACL_PROTECTED |
+                       SEC_DESC_SERVER_SECURITY);
+       }
+
+
+       if (!(sd_flags & SECINFO_OWNER) && user_descriptor) {
+               user_descriptor->owner_sid = NULL;
+
+               /*
+                * We need the correct owner sid
+                * when calculating the DACL or SACL
+                */
+               if (old_descriptor) {
+                       user_descriptor->owner_sid = old_descriptor->owner_sid;
+               }
+       }
+       if (!(sd_flags & SECINFO_GROUP) && user_descriptor) {
+               user_descriptor->group_sid = NULL;
+
+               /*
+                * We need the correct group sid
+                * when calculating the DACL or SACL
+                */
+               if (old_descriptor) {
+                       user_descriptor->group_sid = old_descriptor->group_sid;
+               }
+       }
+       if (!(sd_flags & SECINFO_DACL) && user_descriptor) {
+               user_descriptor->dacl = NULL;
+
+               /*
+                * We add SEC_DESC_DACL_PROTECTED so that
+                * create_security_descriptor() skips
+                * the unused inheritance calculation
+                */
+               user_descriptor->type |= SEC_DESC_DACL_PROTECTED;
+       }
+       if (!(sd_flags & SECINFO_SACL) && user_descriptor) {
+               user_descriptor->sacl = NULL;
+
+               /*
+                * We add SEC_DESC_SACL_PROTECTED so that
+                * create_security_descriptor() skips
+                * the unused inheritance calculation
+                */
+               user_descriptor->type |= SEC_DESC_SACL_PROTECTED;
+       }
+
        default_owner = get_default_ag(mem_ctx, dn,
                                       session_info->security_token, ldb);
        default_group = get_default_group(mem_ctx, ldb, default_owner);
-       new_sd = create_security_descriptor(mem_ctx, parent_descriptor, user_descriptor, true,
-                                           NULL, SEC_DACL_AUTO_INHERIT|SEC_SACL_AUTO_INHERIT,
+       new_sd = create_security_descriptor(mem_ctx,
+                                           parent_descriptor,
+                                           user_descriptor,
+                                           true,
+                                           object_list,
+                                           SEC_DACL_AUTO_INHERIT |
+                                           SEC_SACL_AUTO_INHERIT,
                                            session_info->security_token,
                                            default_owner, default_group,
                                            map_generic_rights_ds);
@@ -306,8 +442,21 @@ static DATA_BLOB *get_new_descriptor(struct ldb_module *module,
        if (!final_sd) {
                return NULL;
        }
-       sddl_sd = sddl_encode(mem_ctx, final_sd, domain_sid);
-       DEBUG(10, ("Object %s created with desriptor %s\n\n", ldb_dn_get_linearized(dn), sddl_sd));
+
+       if (final_sd->dacl) {
+               final_sd->dacl->revision = SECURITY_ACL_REVISION_ADS;
+       }
+       if (final_sd->sacl) {
+               final_sd->sacl->revision = SECURITY_ACL_REVISION_ADS;
+       }
+
+       {
+               TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+               DBG_DEBUG("Object %s created with descriptor %s\n\n",
+                         ldb_dn_get_linearized(dn),
+                         sddl_encode(tmp_ctx, final_sd, domain_sid));
+               TALLOC_FREE(tmp_ctx);
+       }
 
        linear_sd = talloc(mem_ctx, DATA_BLOB);
        if (!linear_sd) {
@@ -315,7 +464,6 @@ static DATA_BLOB *get_new_descriptor(struct ldb_module *module,
        }
 
        ndr_err = ndr_push_struct_blob(linear_sd, mem_ctx,
-                                      lp_iconv_convenience(ldb_get_opaque(ldb, "loadparm")),
                                       final_sd,
                                       (ndr_push_flags_fn_t)ndr_push_security_descriptor);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -333,13 +481,12 @@ static DATA_BLOB *descr_get_descriptor_to_show(struct ldb_module *module,
        struct security_descriptor *old_sd, *final_sd;
        DATA_BLOB *linear_sd;
        enum ndr_err_code ndr_err;
-       struct ldb_context *ldb = ldb_module_get_ctx(module);
 
        old_sd = talloc(mem_ctx, struct security_descriptor);
        if (!old_sd) {
                return NULL;
        }
-       ndr_err = ndr_pull_struct_blob(sd, old_sd, NULL,
+       ndr_err = ndr_pull_struct_blob(sd, old_sd, 
                                       old_sd,
                                       (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
 
@@ -360,7 +507,6 @@ static DATA_BLOB *descr_get_descriptor_to_show(struct ldb_module *module,
        }
 
        ndr_err = ndr_push_struct_blob(linear_sd, mem_ctx,
-                                      lp_iconv_convenience(ldb_get_opaque(ldb, "loadparm")),
                                       final_sd,
                                       (ndr_push_flags_fn_t)ndr_push_security_descriptor);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -389,141 +535,13 @@ static struct descriptor_context *descriptor_init_context(struct ldb_module *mod
        return ac;
 }
 
-static int get_search_callback(struct ldb_request *req, struct ldb_reply *ares)
-{
-       struct ldb_context *ldb;
-       struct descriptor_context *ac;
-       int ret;
-
-       ac = talloc_get_type(req->context, struct descriptor_context);
-       ldb = ldb_module_get_ctx(ac->module);
-
-       if (!ares) {
-               return ldb_module_done(ac->req, NULL, NULL,
-                                       LDB_ERR_OPERATIONS_ERROR);
-       }
-       if (ares->error != LDB_SUCCESS &&
-           ares->error != LDB_ERR_NO_SUCH_OBJECT) {
-               return ldb_module_done(ac->req, ares->controls,
-                                       ares->response, ares->error);
-       }
-
-       ldb_reset_err_string(ldb);
-
-       switch (ares->type) {
-       case LDB_REPLY_ENTRY:
-                       if (ac->search_res != NULL) {
-                       ldb_set_errstring(ldb, "Too many results");
-                       talloc_free(ares);
-                       return ldb_module_done(ac->req, NULL, NULL,
-                                               LDB_ERR_OPERATIONS_ERROR);
-                                               }
-
-               ac->search_res = talloc_steal(ac, ares);
-               break;
-
-       case LDB_REPLY_REFERRAL:
-               /* ignore */
-               talloc_free(ares);
-               break;
-
-       case LDB_REPLY_DONE:
-               talloc_free(ares);
-               ret = ac->step_fn(ac);
-               if (ret != LDB_SUCCESS) {
-                       return ldb_module_done(ac->req, NULL, NULL, ret);
-               }
-               break;
-       }
-
-       return LDB_SUCCESS;
-}
-
-static int get_search_oc_callback(struct ldb_request *req, struct ldb_reply *ares)
-{
-       struct ldb_context *ldb;
-       struct descriptor_context *ac;
-       int ret;
-
-       ac = talloc_get_type(req->context, struct descriptor_context);
-       ldb = ldb_module_get_ctx(ac->module);
-
-       if (!ares) {
-               return ldb_module_done(ac->req, NULL, NULL,
-                                       LDB_ERR_OPERATIONS_ERROR);
-       }
-       if (ares->error != LDB_SUCCESS &&
-           ares->error != LDB_ERR_NO_SUCH_OBJECT) {
-               return ldb_module_done(ac->req, ares->controls,
-                                       ares->response, ares->error);
-       }
-
-       ldb_reset_err_string(ldb);
-
-       switch (ares->type) {
-       case LDB_REPLY_ENTRY:
-                       if (ac->search_oc_res != NULL) {
-                       ldb_set_errstring(ldb, "Too many results");
-                       talloc_free(ares);
-                       return ldb_module_done(ac->req, NULL, NULL,
-                                               LDB_ERR_OPERATIONS_ERROR);
-                                               }
-
-               ac->search_oc_res = talloc_steal(ac, ares);
-               break;
-
-       case LDB_REPLY_REFERRAL:
-               /* ignore */
-               talloc_free(ares);
-               break;
-
-       case LDB_REPLY_DONE:
-               talloc_free(ares);
-               ret = ac->step_fn(ac);
-               if (ret != LDB_SUCCESS) {
-                       return ldb_module_done(ac->req, NULL, NULL, ret);
-               }
-               break;
-       }
-
-       return LDB_SUCCESS;
-}
-
-
-static int descriptor_op_callback(struct ldb_request *req, struct ldb_reply *ares)
-{
-       struct descriptor_context *ac;
-
-       ac = talloc_get_type(req->context, struct descriptor_context);
-
-       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) {
-               talloc_free(ares);
-               return ldb_module_done(ac->req, NULL, NULL,
-                                       LDB_ERR_OPERATIONS_ERROR);
-       }
-
-       return ldb_module_done(ac->req, ares->controls,
-                               ares->response, ares->error);
-}
-
 static int descriptor_search_callback(struct ldb_request *req, struct ldb_reply *ares)
 {
        struct descriptor_context *ac;
-       struct ldb_control *sd_control;
        struct ldb_val *sd_val = NULL;
        struct ldb_message_element *sd_el;
        DATA_BLOB *show_sd;
-       int ret;
-       uint32_t sd_flags = 0;
+       int ret = LDB_SUCCESS;
 
        ac = talloc_get_type(req->context, struct descriptor_context);
 
@@ -536,25 +554,16 @@ static int descriptor_search_callback(struct ldb_request *req, struct ldb_reply
                                        ares->response, ares->error);
        }
 
-       sd_control = ldb_request_get_control(ac->req, LDB_CONTROL_SD_FLAGS_OID);
-       if (sd_control) {
-               struct ldb_sd_flags_control *sdctr = (struct ldb_sd_flags_control *)sd_control->data;
-               sd_flags = sdctr->secinfo_flags;
-               /* we only care for the last 4 bits */
-               sd_flags = sd_flags & 0x0000000F;
-       }
-
        switch (ares->type) {
        case LDB_REPLY_ENTRY:
-               if (sd_flags != 0) {
-                       sd_el = ldb_msg_find_element(ares->message, "nTSecurityDescriptor");
-                       if (sd_el) {
-                               sd_val = sd_el->values;
-                       }
+               sd_el = ldb_msg_find_element(ares->message, "nTSecurityDescriptor");
+               if (sd_el) {
+                       sd_val = sd_el->values;
                }
+
                if (sd_val) {
                        show_sd = descr_get_descriptor_to_show(ac->module, ac->req,
-                                                              sd_val, sd_flags);
+                                                              sd_val, ac->sd_flags);
                        if (!show_sd) {
                                ret = LDB_ERR_OPERATIONS_ERROR;
                                goto fail;
@@ -568,294 +577,413 @@ static int descriptor_search_callback(struct ldb_request *req, struct ldb_reply
                return ldb_module_send_entry(ac->req, ares->message, ares->controls);
 
        case LDB_REPLY_REFERRAL:
-               /* ignore referrals */
-               break;
+               return ldb_module_send_referral(ac->req, ares->referral);
 
        case LDB_REPLY_DONE:
                return ldb_module_done(ac->req, ares->controls,
                                        ares->response, ares->error);
        }
 
-       talloc_free(ares);
-       return LDB_SUCCESS;
 fail:
+       talloc_free(ares);
        return ldb_module_done(ac->req, NULL, NULL, ret);
 }
 
-static int descriptor_do_mod(struct descriptor_context *ac)
+static int descriptor_add(struct ldb_module *module, struct ldb_request *req)
 {
-       struct ldb_context *ldb;
-       const struct dsdb_schema *schema;
-       struct ldb_request *mod_req;
-       struct ldb_message_element *objectclass_element, *tmp_element, *oldsd_el;
-       struct ldb_val *oldsd_val = NULL;
+       struct ldb_context *ldb = ldb_module_get_ctx(module);
+       struct ldb_request *add_req;
+       struct ldb_message *msg;
+       struct ldb_result *parent_res;
+       const struct ldb_val *parent_sd = NULL;
+       const struct ldb_val *user_sd;
+       struct ldb_dn *dn = req->op.add.message->dn;
+       struct ldb_dn *parent_dn, *nc_root;
+       struct ldb_message_element *objectclass_element, *sd_element;
        int ret;
+       const struct dsdb_schema *schema;
        DATA_BLOB *sd;
        const struct dsdb_class *objectclass;
-       struct ldb_message *msg;
-       struct ldb_control *sd_control;
-       struct ldb_control *sd_control2;
-       struct ldb_control **saved_controls;
-       int flags = 0;
-       uint32_t sd_flags = 0;
-
-       ldb = ldb_module_get_ctx(ac->module);
-       schema = dsdb_get_schema(ldb);
-       msg = ldb_msg_copy_shallow(ac, ac->req->op.mod.message);
-       objectclass_element = ldb_msg_find_element(ac->search_oc_res->message, "objectClass");
-       objectclass = get_last_structural_class(schema, objectclass_element);
-
-       if (!objectclass) {
-               ldb_asprintf_errstring(ldb, "No last structural objectclass found on %s",
-                                      ldb_dn_get_linearized(ac->search_oc_res->message->dn));
-               return LDB_ERR_OPERATIONS_ERROR;
+       static const char * const parent_attrs[] = { "nTSecurityDescriptor", NULL };
+       uint32_t instanceType;
+       bool isNC = false;
+       uint32_t sd_flags = dsdb_request_sd_flags(req, NULL);
+
+       /* do not manipulate our control entries */
+       if (ldb_dn_is_special(dn)) {
+               return ldb_next_request(module, req);
        }
-       sd_control = ldb_request_get_control(ac->req, LDB_CONTROL_SD_FLAGS_OID);
-       sd_control2 = ldb_request_get_control(ac->req, LDB_CONTROL_RECALCULATE_SD_OID);
-       if (sd_control) {
-               struct ldb_sd_flags_control *sdctr = (struct ldb_sd_flags_control *)sd_control->data;
-               sd_flags = sdctr->secinfo_flags;
-               /* we only care for the last 4 bits */
-               sd_flags = sd_flags & 0x0000000F;
+
+       user_sd = ldb_msg_find_ldb_val(req->op.add.message, "nTSecurityDescriptor");
+       sd_element = ldb_msg_find_element(req->op.add.message, "nTSecurityDescriptor");
+       /* nTSecurityDescriptor without a value is an error, letting through so it is handled */
+       if (user_sd == NULL && sd_element) {
+               return ldb_next_request(module, req);
        }
-       if (sd_flags != 0) {
-               oldsd_el = ldb_msg_find_element(ac->search_oc_res->message, "nTSecurityDescriptor");
-               if (oldsd_el) {
-                       oldsd_val = oldsd_el->values;
+
+       ldb_debug(ldb, LDB_DEBUG_TRACE,"descriptor_add: %s\n", ldb_dn_get_linearized(dn));
+
+       instanceType = ldb_msg_find_attr_as_uint(req->op.add.message, "instanceType", 0);
+
+       if (instanceType & INSTANCE_TYPE_IS_NC_HEAD) {
+               isNC = true;
+       }
+
+       if (!isNC) {
+               ret = dsdb_find_nc_root(ldb, req, dn, &nc_root);
+               if (ret != LDB_SUCCESS) {
+                       ldb_debug(ldb, LDB_DEBUG_TRACE,"descriptor_add: Could not find NC root for %s\n",
+                               ldb_dn_get_linearized(dn));
+                       return ret;
+               }
+
+               if (ldb_dn_compare(dn, nc_root) == 0) {
+                       DEBUG(0, ("Found DN %s being a NC by the old method\n", ldb_dn_get_linearized(dn)));
+                       isNC = true;
                }
        }
-       sd = get_new_descriptor(ac->module, msg->dn, ac, objectclass,
-                               ac->parentsd_val, ac->sd_val, oldsd_val, sd_flags);
-       if (ac->sd_val) {
-               tmp_element = ldb_msg_find_element(msg, "ntSecurityDescriptor");
-               flags = tmp_element->flags;
-               ldb_msg_remove_attr(msg, "nTSecurityDescriptor");
+
+       if (isNC) {
+               DEBUG(2, ("DN: %s is a NC\n", ldb_dn_get_linearized(dn)));
        }
+       if (!isNC) {
+               /* if the object has a parent, retrieve its SD to
+                * use for calculation. Unfortunately we do not yet have
+                * instanceType, so we use dsdb_find_nc_root. */
+
+               parent_dn = ldb_dn_get_parent(req, dn);
+               if (parent_dn == NULL) {
+                       return ldb_oom(ldb);
+               }
 
-       if (sd) {
-               ret = ldb_msg_add_steal_value(msg, "nTSecurityDescriptor", sd);
+               /* we aren't any NC */
+               ret = dsdb_module_search_dn(module, req, &parent_res, parent_dn,
+                                           parent_attrs,
+                                           DSDB_FLAG_NEXT_MODULE |
+                                           DSDB_FLAG_AS_SYSTEM |
+                                           DSDB_SEARCH_SHOW_RECYCLED,
+                                           req);
                if (ret != LDB_SUCCESS) {
+                       ldb_debug(ldb, LDB_DEBUG_TRACE,"descriptor_add: Could not find SD for %s\n",
+                                 ldb_dn_get_linearized(parent_dn));
                        return ret;
                }
-               tmp_element = ldb_msg_find_element(msg, "ntSecurityDescriptor");
-               if (sd_control2) {
-                       tmp_element->flags = LDB_FLAG_MOD_REPLACE;
-               } else {
-                       tmp_element->flags = flags;
+               if (parent_res->count != 1) {
+                       return ldb_operr(ldb);
                }
+               parent_sd = ldb_msg_find_ldb_val(parent_res->msgs[0], "nTSecurityDescriptor");
        }
-       ret = ldb_build_mod_req(&mod_req, ldb, ac,
-                               msg,
-                               ac->req->controls,
-                               ac, descriptor_op_callback,
-                               ac->req);
-       if (ret != LDB_SUCCESS) {
-               return ret;
+
+       schema = dsdb_get_schema(ldb, req);
+
+       objectclass_element = ldb_msg_find_element(req->op.add.message, "objectClass");
+       if (objectclass_element == NULL) {
+               return ldb_operr(ldb);
        }
-       /* save it locally and remove it from the list */
-       /* we do not need to replace them later as we
-        * are keeping the original req intact */
-       if (sd_control) {
-               if (!save_controls(sd_control, mod_req, &saved_controls)) {
-                       return LDB_ERR_OPERATIONS_ERROR;
+
+       objectclass = dsdb_get_last_structural_class(schema,
+                                                    objectclass_element);
+       if (objectclass == NULL) {
+               return ldb_operr(ldb);
+       }
+
+       /*
+        * The SD_FLAG control is ignored on add
+        * and we default to all bits set.
+        */
+       sd_flags = SECINFO_OWNER|SECINFO_GROUP|SECINFO_SACL|SECINFO_DACL;
+
+       sd = get_new_descriptor(module, dn, req,
+                               objectclass, parent_sd,
+                               user_sd, NULL, sd_flags);
+       if (sd == NULL) {
+               return ldb_operr(ldb);
+       }
+       msg = ldb_msg_copy_shallow(req, req->op.add.message);
+       if (msg == NULL) {
+               return ldb_oom(ldb);
+       }
+       if (sd_element != NULL) {
+               sd_element->values[0] = *sd;
+       } else {
+               ret = ldb_msg_add_steal_value(msg,
+                                             "nTSecurityDescriptor",
+                                             sd);
+               if (ret != LDB_SUCCESS) {
+                       return ret;
                }
        }
 
-       return ldb_next_request(ac->module, mod_req);
+       ret = ldb_build_add_req(&add_req, ldb, req,
+                               msg,
+                               req->controls,
+                               req, dsdb_next_callback,
+                               req);
+       LDB_REQ_SET_LOCATION(add_req);
+       if (ret != LDB_SUCCESS) {
+               return ldb_error(ldb, ret,
+                                "descriptor_add: Error creating new add request.");
+       }
+
+       return ldb_next_request(module, add_req);
 }
 
-static int descriptor_do_add(struct descriptor_context *ac)
+static int descriptor_modify(struct ldb_module *module, struct ldb_request *req)
 {
-       struct ldb_context *ldb;
-       const struct dsdb_schema *schema;
-       struct ldb_request *add_req;
-       struct ldb_message_element *objectclass_element, *sd_element = NULL;
+       struct ldb_context *ldb = ldb_module_get_ctx(module);
+       struct ldb_request *mod_req;
        struct ldb_message *msg;
-       TALLOC_CTX *mem_ctx;
+       struct ldb_result *current_res, *parent_res;
+       const struct ldb_val *old_sd = NULL;
+       const struct ldb_val *parent_sd = NULL;
+       const struct ldb_val *user_sd;
+       struct ldb_dn *dn = req->op.mod.message->dn;
+       struct ldb_dn *parent_dn;
+       struct ldb_message_element *objectclass_element, *sd_element;
        int ret;
+       uint32_t instanceType;
+       bool explicit_sd_flags = false;
+       uint32_t sd_flags = dsdb_request_sd_flags(req, &explicit_sd_flags);
+       const struct dsdb_schema *schema;
        DATA_BLOB *sd;
        const struct dsdb_class *objectclass;
-       static const char *const attrs[] = { "objectClass", "nTSecurityDescriptor", NULL };
-       struct ldb_request *search_req;
-
-       ldb = ldb_module_get_ctx(ac->module);
-       schema = dsdb_get_schema(ldb);
-       mem_ctx = talloc_new(ac);
-       if (mem_ctx == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
-       switch (ac->req->operation) {
-       case LDB_ADD:
-               msg = ldb_msg_copy_shallow(ac, ac->req->op.add.message);
-               objectclass_element = ldb_msg_find_element(msg, "objectClass");
-               objectclass = get_last_structural_class(schema, objectclass_element);
-
-               if (!objectclass) {
-                       ldb_asprintf_errstring(ldb, "No last structural objectclass found on %s", ldb_dn_get_linearized(msg->dn));
-                       return LDB_ERR_OPERATIONS_ERROR;
-               }
-               break;
-       case LDB_MODIFY:
-               msg = ldb_msg_copy_shallow(ac, ac->req->op.mod.message);
-               break;
-       default:
-               return LDB_ERR_OPERATIONS_ERROR;
+       static const char * const parent_attrs[] = { "nTSecurityDescriptor", NULL };
+       static const char * const current_attrs[] = { "nTSecurityDescriptor",
+                                                     "instanceType",
+                                                     "objectClass", NULL };
+       struct ldb_control *sd_propagation_control;
+       int cmp_ret = -1;
+
+       /* do not manipulate our control entries */
+       if (ldb_dn_is_special(dn)) {
+               return ldb_next_request(module, req);
        }
 
+       sd_propagation_control = ldb_request_get_control(req,
+                                       DSDB_CONTROL_SEC_DESC_PROPAGATION_OID);
+       if (sd_propagation_control != NULL) {
+               if (sd_propagation_control->data != module) {
+                       return ldb_operr(ldb);
+               }
+               if (req->op.mod.message->num_elements != 0) {
+                       return ldb_operr(ldb);
+               }
+               if (explicit_sd_flags) {
+                       return ldb_operr(ldb);
+               }
+               if (sd_flags != 0xF) {
+                       return ldb_operr(ldb);
+               }
+               if (sd_propagation_control->critical == 0) {
+                       return ldb_operr(ldb);
+               }
 
-       /* get the security descriptor values*/
-       sd_element = ldb_msg_find_element(msg, "nTSecurityDescriptor");
-       if (sd_element) {
-               ac->sd_val = talloc_memdup(ac, &sd_element->values[0], sizeof(struct ldb_val));
+               sd_propagation_control->critical = 0;
        }
-       /* NC's have no parent */
-       if ((ldb_dn_compare(msg->dn, (ldb_get_schema_basedn(ldb))) == 0) ||
-           (ldb_dn_compare(msg->dn, (ldb_get_config_basedn(ldb))) == 0) ||
-           (ldb_dn_compare(msg->dn, (ldb_get_root_basedn(ldb))) == 0)) {
-               ac->parentsd_val = NULL;
-       } else if (ac->search_res != NULL) {
-               struct ldb_message_element *parent_element = ldb_msg_find_element(ac->search_res->message, "nTSecurityDescriptor");
-               if (parent_element) {
-                       ac->parentsd_val = talloc_memdup(ac, &parent_element->values[0], sizeof(struct ldb_val));
-               }
+
+       sd_element = ldb_msg_find_element(req->op.mod.message, "nTSecurityDescriptor");
+       if (sd_propagation_control == NULL && sd_element == NULL) {
+               return ldb_next_request(module, req);
        }
 
-       if (ac->req->operation == LDB_ADD) {
-       /* get the parent descriptor and the one provided. If not provided, get the default.*/
-       /* convert to security descriptor and calculate */
-               sd = get_new_descriptor(ac->module, msg->dn, mem_ctx, objectclass,
-                                       ac->parentsd_val, ac->sd_val, NULL, 0);
-               if (ac->sd_val) {
-                       ldb_msg_remove_attr(msg, "nTSecurityDescriptor");
-               }
+       /*
+        * nTSecurityDescriptor with DELETE is not supported yet.
+        * TODO: handle this correctly.
+        */
+       if (sd_propagation_control == NULL &&
+           LDB_FLAG_MOD_TYPE(sd_element->flags) == LDB_FLAG_MOD_DELETE)
+       {
+               return ldb_module_error(module,
+                                       LDB_ERR_UNWILLING_TO_PERFORM,
+                                       "MOD_DELETE for nTSecurityDescriptor "
+                                       "not supported yet");
+       }
 
-               if (sd) {
-                       ret = ldb_msg_add_steal_value(msg, "nTSecurityDescriptor", sd);
-                       if (ret != LDB_SUCCESS) {
-                               return ret;
-                       }
-               }
+       user_sd = ldb_msg_find_ldb_val(req->op.mod.message, "nTSecurityDescriptor");
+       /* nTSecurityDescriptor without a value is an error, letting through so it is handled */
+       if (sd_propagation_control == NULL && user_sd == NULL) {
+               return ldb_next_request(module, req);
+       }
 
-               talloc_free(mem_ctx);
-               ret = ldb_msg_sanity_check(ldb, msg);
+       ldb_debug(ldb, LDB_DEBUG_TRACE,"descriptor_modify: %s\n", ldb_dn_get_linearized(dn));
 
-               if (ret != LDB_SUCCESS) {
-                       ldb_asprintf_errstring(ldb, "No last structural objectclass found on %s",
-                                              ldb_dn_get_linearized(msg->dn));
-                       return ret;
-               }
+       ret = dsdb_module_search_dn(module, req, &current_res, dn,
+                                   current_attrs,
+                                   DSDB_FLAG_NEXT_MODULE |
+                                   DSDB_FLAG_AS_SYSTEM |
+                                   DSDB_SEARCH_SHOW_RECYCLED |
+                                   DSDB_SEARCH_SHOW_EXTENDED_DN,
+                                   req);
+       if (ret != LDB_SUCCESS) {
+               ldb_debug(ldb, LDB_DEBUG_ERROR,"descriptor_modify: Could not find %s\n",
+                         ldb_dn_get_linearized(dn));
+               return ret;
+       }
 
-               ret = ldb_build_add_req(&add_req, ldb, ac,
-                                       msg,
-                                       ac->req->controls,
-                                       ac, descriptor_op_callback,
-                                       ac->req);
-               if (ret != LDB_SUCCESS) {
-                       return ret;
+       instanceType = ldb_msg_find_attr_as_uint(current_res->msgs[0],
+                                                "instanceType", 0);
+       /* if the object has a parent, retrieve its SD to
+        * use for calculation */
+       if (!ldb_dn_is_null(current_res->msgs[0]->dn) &&
+           !(instanceType & INSTANCE_TYPE_IS_NC_HEAD)) {
+               parent_dn = ldb_dn_get_parent(req, dn);
+               if (parent_dn == NULL) {
+                       return ldb_oom(ldb);
                }
-               return ldb_next_request(ac->module, add_req);
-       } else {
-               ret = ldb_build_search_req(&search_req, ldb,
-                                  ac, msg->dn, LDB_SCOPE_BASE,
-                                  "(objectClass=*)", attrs,
-                                  NULL,
-                                  ac, get_search_oc_callback,
-                                  ac->req);
+               ret = dsdb_module_search_dn(module, req, &parent_res, parent_dn,
+                                           parent_attrs,
+                                           DSDB_FLAG_NEXT_MODULE |
+                                           DSDB_FLAG_AS_SYSTEM |
+                                           DSDB_SEARCH_SHOW_RECYCLED,
+                                           req);
                if (ret != LDB_SUCCESS) {
+                       ldb_debug(ldb, LDB_DEBUG_ERROR, "descriptor_modify: Could not find SD for %s\n",
+                                 ldb_dn_get_linearized(parent_dn));
                        return ret;
                }
-               ac->step_fn = descriptor_do_mod;
-               return ldb_next_request(ac->module, search_req);
+               if (parent_res->count != 1) {
+                       return ldb_operr(ldb);
+               }
+               parent_sd = ldb_msg_find_ldb_val(parent_res->msgs[0], "nTSecurityDescriptor");
        }
-}
 
-static int descriptor_change(struct ldb_module *module, struct ldb_request *req)
-{
-       struct ldb_context *ldb;
-       struct ldb_control *sd_control;
-       struct ldb_request *search_req;
-       struct descriptor_context *ac;
-       struct ldb_dn *parent_dn, *dn;
-       struct ldb_message_element *sd_element;
-       int ret;
-       static const char * const descr_attrs[] = { "nTSecurityDescriptor", NULL };
+       schema = dsdb_get_schema(ldb, req);
 
-       ldb = ldb_module_get_ctx(module);
+       objectclass_element = ldb_msg_find_element(current_res->msgs[0], "objectClass");
+       if (objectclass_element == NULL) {
+               return ldb_operr(ldb);
+       }
 
-       switch (req->operation) {
-       case LDB_ADD:
-               dn = req->op.add.message->dn;
-               break;
-       case LDB_MODIFY:
-               dn = req->op.mod.message->dn;
-               sd_element = ldb_msg_find_element(req->op.mod.message, "nTSecurityDescriptor");
-               /* This control allow forcing the recalculation of the SD */
-               sd_control = ldb_request_get_control(req, LDB_CONTROL_RECALCULATE_SD_OID);
-               if (!sd_element && !sd_control) {
-                       return ldb_next_request(module, req);
-               }
-               break;
-       default:
-               return LDB_ERR_OPERATIONS_ERROR;
+       objectclass = dsdb_get_last_structural_class(schema,
+                                                    objectclass_element);
+       if (objectclass == NULL) {
+               return ldb_operr(ldb);
        }
-       ldb_debug(ldb, LDB_DEBUG_TRACE,"descriptor_change: %s\n", ldb_dn_get_linearized(dn));
 
-       if (ldb_dn_is_special(dn)) {
-               return ldb_next_request(module, req);
+       old_sd = ldb_msg_find_ldb_val(current_res->msgs[0], "nTSecurityDescriptor");
+       if (old_sd == NULL) {
+               return ldb_operr(ldb);
        }
 
-       ac = descriptor_init_context(module, req);
-       if (ac == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
+       if (sd_propagation_control != NULL) {
+               /*
+                * This just triggers a recalculation of the
+                * inherited aces.
+                */
+               user_sd = old_sd;
        }
 
-       /* If there isn't a parent, just go on to the add processing */
-       if (ldb_dn_get_comp_num(dn) == 1) {
-               return descriptor_do_add(ac);
+       sd = get_new_descriptor(module, current_res->msgs[0]->dn, req,
+                               objectclass, parent_sd,
+                               user_sd, old_sd, sd_flags);
+       if (sd == NULL) {
+               return ldb_operr(ldb);
        }
+       msg = ldb_msg_copy_shallow(req, req->op.mod.message);
+       if (msg == NULL) {
+               return ldb_oom(ldb);
+       }
+       cmp_ret = data_blob_cmp(old_sd, sd);
+       if (sd_propagation_control != NULL) {
+               if (cmp_ret == 0) {
+                       /*
+                        * The nTSecurityDescriptor is unchanged,
+                        * which means we can stop the processing.
+                        *
+                        * We mark the control as critical again,
+                        * as we have not processed it, so the caller
+                        * can tell that the descriptor was unchanged.
+                        */
+                       sd_propagation_control->critical = 1;
+                       return ldb_module_done(req, NULL, NULL, LDB_SUCCESS);
+               }
 
-       /* get copy of parent DN */
-       parent_dn = ldb_dn_get_parent(ac, dn);
-       if (parent_dn == NULL) {
-               ldb_oom(ldb);
-               return LDB_ERR_OPERATIONS_ERROR;
+               ret = ldb_msg_add_empty(msg, "nTSecurityDescriptor",
+                                       LDB_FLAG_MOD_REPLACE,
+                                       &sd_element);
+               if (ret != LDB_SUCCESS) {
+                       return ldb_oom(ldb);
+               }
+               ret = ldb_msg_add_value(msg, "nTSecurityDescriptor",
+                                       sd, NULL);
+               if (ret != LDB_SUCCESS) {
+                       return ldb_oom(ldb);
+               }
+       } else if (cmp_ret != 0) {
+               struct GUID guid;
+               struct ldb_dn *nc_root;
+               NTSTATUS status;
+
+               ret = dsdb_find_nc_root(ldb,
+                                       msg,
+                                       current_res->msgs[0]->dn,
+                                       &nc_root);
+               if (ret != LDB_SUCCESS) {
+                       return ldb_oom(ldb);
+               }
+
+               status = dsdb_get_extended_dn_guid(current_res->msgs[0]->dn,
+                                                  &guid,
+                                                  "GUID");
+               if (!NT_STATUS_IS_OK(status)) {
+                       return ldb_operr(ldb);
+               }
+
+               /*
+                * Force SD propagation on children of this record
+                */
+               ret = dsdb_module_schedule_sd_propagation(module,
+                                                         nc_root,
+                                                         guid,
+                                                         false);
+               if (ret != LDB_SUCCESS) {
+                       return ldb_operr(ldb);
+               }
+               sd_element->values[0] = *sd;
+       } else {
+               sd_element->values[0] = *sd;
        }
 
-       ret = ldb_build_search_req(&search_req, ldb,
-                                  ac, parent_dn, LDB_SCOPE_BASE,
-                                  "(objectClass=*)", descr_attrs,
-                                  NULL,
-                                  ac, get_search_callback,
-                                  req);
+       ret = ldb_build_mod_req(&mod_req, ldb, req,
+                               msg,
+                               req->controls,
+                               req,
+                               dsdb_next_callback,
+                               req);
+       LDB_REQ_SET_LOCATION(mod_req);
        if (ret != LDB_SUCCESS) {
                return ret;
        }
-       talloc_steal(search_req, parent_dn);
 
-       ac->step_fn = descriptor_do_add;
-
-       return ldb_next_request(ac->module, search_req);
+       return ldb_next_request(module, mod_req);
 }
 
 static int descriptor_search(struct ldb_module *module, struct ldb_request *req)
 {
        int ret;
        struct ldb_context *ldb;
-       struct ldb_control *sd_control;
-       struct ldb_control **saved_controls;
        struct ldb_request *down_req;
        struct descriptor_context *ac;
+       bool explicit_sd_flags = false;
+       uint32_t sd_flags = dsdb_request_sd_flags(req, &explicit_sd_flags);
+       bool show_sd = explicit_sd_flags;
+
+       if (!show_sd &&
+           ldb_attr_in_list(req->op.search.attrs, "nTSecurityDescriptor"))
+       {
+               show_sd = true;
+       }
 
-       sd_control = ldb_request_get_control(req, LDB_CONTROL_SD_FLAGS_OID);
-       if (!sd_control) {
+       if (!show_sd) {
                return ldb_next_request(module, req);
        }
 
        ldb = ldb_module_get_ctx(module);
        ac = descriptor_init_context(module, req);
        if (ac == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
+               return ldb_operr(ldb);
        }
+       ac->sd_flags = sd_flags;
 
        ret = ldb_build_search_req_ex(&down_req, ldb, ac,
                                      req->op.search.base,
@@ -865,48 +993,592 @@ static int descriptor_search(struct ldb_module *module, struct ldb_request *req)
                                      req->controls,
                                      ac, descriptor_search_callback,
                                      ac->req);
+       LDB_REQ_SET_LOCATION(down_req);
        if (ret != LDB_SUCCESS) {
                return ret;
        }
-       /* save it locally and remove it from the list */
-       /* we do not need to replace them later as we
-        * are keeping the original req intact */
-       if (sd_control) {
-               if (!save_controls(sd_control, down_req, &saved_controls)) {
-                       return LDB_ERR_OPERATIONS_ERROR;
-               }
-       }
 
        return ldb_next_request(ac->module, down_req);
 }
-/* TODO */
+
 static int descriptor_rename(struct ldb_module *module, struct ldb_request *req)
 {
        struct ldb_context *ldb = ldb_module_get_ctx(module);
-       ldb_debug(ldb, LDB_DEBUG_TRACE,"descriptor_rename: %s\n", ldb_dn_get_linearized(req->op.rename.olddn));
+       struct ldb_dn *olddn = req->op.rename.olddn;
+       struct ldb_dn *newdn = req->op.rename.newdn;
+       int ret;
+
+       /* do not manipulate our control entries */
+       if (ldb_dn_is_special(req->op.rename.olddn)) {
+               return ldb_next_request(module, req);
+       }
+
+       ldb_debug(ldb, LDB_DEBUG_TRACE,"descriptor_rename: %s\n",
+                 ldb_dn_get_linearized(olddn));
+
+       if (ldb_dn_compare(olddn, newdn) != 0) {
+               struct ldb_dn *nc_root;
+               struct GUID guid;
+
+               ret = dsdb_find_nc_root(ldb, req, newdn, &nc_root);
+               if (ret != LDB_SUCCESS) {
+                       return ldb_oom(ldb);
+               }
+
+               ret = dsdb_module_guid_by_dn(module,
+                                            olddn,
+                                            &guid,
+                                            req);
+               if (ret == LDB_SUCCESS) {
+                       /*
+                        * Without disturbing any errors if the olddn
+                        * does not exit, force SD propagation on
+                        * this record (get a new inherited SD from
+                        * the potentially new parent
+                        */
+                       ret = dsdb_module_schedule_sd_propagation(module,
+                                                                 nc_root,
+                                                                 guid,
+                                                                 true);
+                       if (ret != LDB_SUCCESS) {
+                               return ldb_operr(ldb);
+                       }
+               }
+       }
+
+       return ldb_next_request(module, req);
+}
+
+static void descriptor_changes_parser(TDB_DATA key, TDB_DATA data, void *private_data)
+{
+       struct descriptor_changes **c_ptr = (struct descriptor_changes **)private_data;
+       uintptr_t ptr = 0;
+
+       SMB_ASSERT(data.dsize == sizeof(ptr));
+
+       memcpy(&ptr, data.dptr, data.dsize);
+
+       *c_ptr = talloc_get_type_abort((void *)ptr, struct descriptor_changes);
+}
+
+static int descriptor_extended_sec_desc_propagation(struct ldb_module *module,
+                                                   struct ldb_request *req)
+{
+       struct descriptor_data *descriptor_private =
+               talloc_get_type_abort(ldb_module_get_private(module),
+               struct descriptor_data);
+       struct descriptor_transaction *t = &descriptor_private->transaction;
+       struct ldb_context *ldb = ldb_module_get_ctx(module);
+       struct dsdb_extended_sec_desc_propagation_op *op;
+       struct descriptor_changes *c = NULL;
+       TDB_DATA key;
+       NTSTATUS status;
+
+       op = talloc_get_type(req->op.extended.data,
+                            struct dsdb_extended_sec_desc_propagation_op);
+       if (op == NULL) {
+               ldb_debug(ldb, LDB_DEBUG_FATAL,
+                         "descriptor_extended_sec_desc_propagation: "
+                         "invalid extended data\n");
+               return LDB_ERR_PROTOCOL_ERROR;
+       }
+
+       if (t->mem == NULL) {
+               return ldb_module_operr(module);
+       }
+
+       /*
+        * First we check if we already have an registration
+        * for the given object.
+        */
+
+       key = make_tdb_data((const void*)&op->guid, sizeof(op->guid));
+       status = dbwrap_parse_record(t->changes.map, key,
+                                    descriptor_changes_parser, &c);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
+               c = NULL;
+               status = NT_STATUS_OK;
+       }
+       if (!NT_STATUS_IS_OK(status)) {
+               ldb_debug(ldb, LDB_DEBUG_FATAL,
+                         "dbwrap_parse_record() - %s\n",
+                         nt_errstr(status));
+               return ldb_module_operr(module);
+       }
+
+       if (c == NULL) {
+               /*
+                * Create a new structure if we
+                * don't know about the object yet.
+                */
+
+               c = talloc_zero(t->mem, struct descriptor_changes);
+               if (c == NULL) {
+                       return ldb_module_oom(module);
+               }
+               c->nc_root = ldb_dn_copy(c, op->nc_root);
+               if (c->nc_root == NULL) {
+                       return ldb_module_oom(module);
+               }
+               c->guid = op->guid;
+       }
+
+       if (ldb_dn_compare(c->nc_root, op->nc_root) != 0) {
+               /*
+                * This is an unexpected situation,
+                * we don't expect the nc root to change
+                * during a replication cycle.
+                */
+               DBG_ERR("ERROR: Object %s nc_root changed %s => %s\n",
+                       GUID_string(c, &c->guid),
+                       ldb_dn_get_extended_linearized(c, c->nc_root, 1),
+                       ldb_dn_get_extended_linearized(c, op->nc_root, 1));
+               return ldb_module_operr(module);
+       }
+
+       c->ref_count += 1;
+
+       /*
+        * Note that we only set, but don't clear values here,
+        * it means c->force_self and c->force_children can
+        * both be true in the end.
+        */
+       if (op->include_self) {
+               c->force_self = true;
+       } else {
+               c->force_children = true;
+       }
+
+       if (c->ref_count == 1) {
+               struct TDB_DATA val = make_tdb_data((const void*)&c, sizeof(c));
+
+               /*
+                * Remember the change by objectGUID in order
+                * to avoid processing it more than once.
+                */
+
+               status = dbwrap_store(t->changes.map, key, val, TDB_INSERT);
+               if (!NT_STATUS_IS_OK(status)) {
+                       ldb_debug(ldb, LDB_DEBUG_FATAL,
+                                 "dbwrap_parse_record() - %s\n",
+                                 nt_errstr(status));
+                       return ldb_module_operr(module);
+               }
+
+               DLIST_ADD_END(t->changes.list, c);
+               t->changes.num_registered += 1;
+       }
+       t->changes.num_registrations += 1;
+
+       return ldb_module_done(req, NULL, NULL, LDB_SUCCESS);
+}
+
+static int descriptor_extended(struct ldb_module *module, struct ldb_request *req)
+{
+       if (strcmp(req->op.extended.oid, DSDB_EXTENDED_SEC_DESC_PROPAGATION_OID) == 0) {
+               return descriptor_extended_sec_desc_propagation(module, req);
+       }
+
        return ldb_next_request(module, req);
 }
 
 static int descriptor_init(struct ldb_module *module)
 {
-       int ret = ldb_mod_register_control(module, LDB_CONTROL_SD_FLAGS_OID);
        struct ldb_context *ldb = ldb_module_get_ctx(module);
+       int ret;
+       struct descriptor_data *descriptor_private;
+
+       ret = ldb_mod_register_control(module, LDB_CONTROL_SD_FLAGS_OID);
        if (ret != LDB_SUCCESS) {
                ldb_debug(ldb, LDB_DEBUG_ERROR,
                        "descriptor: Unable to register control with rootdse!\n");
+               return ldb_operr(ldb);
+       }
+
+       descriptor_private = talloc_zero(module, struct descriptor_data);
+       if (descriptor_private == NULL) {
+               ldb_oom(ldb);
                return LDB_ERR_OPERATIONS_ERROR;
        }
+       ldb_module_set_private(module, descriptor_private);
+
        return ldb_next_init(module);
 }
 
+static int descriptor_sd_propagation_object(struct ldb_module *module,
+                                           struct ldb_message *msg,
+                                           bool *stop)
+{
+       struct descriptor_data *descriptor_private =
+               talloc_get_type_abort(ldb_module_get_private(module),
+               struct descriptor_data);
+       struct descriptor_transaction *t = &descriptor_private->transaction;
+       struct ldb_context *ldb = ldb_module_get_ctx(module);
+       struct ldb_request *sub_req;
+       struct ldb_result *mod_res;
+       struct ldb_control *sd_propagation_control;
+       int ret;
+
+       *stop = false;
+
+       t->objects.num_processed += 1;
+
+       mod_res = talloc_zero(msg, struct ldb_result);
+       if (mod_res == NULL) {
+               return ldb_module_oom(module);
+       }
+
+       ret = ldb_build_mod_req(&sub_req, ldb, mod_res,
+                               msg,
+                               NULL,
+                               mod_res,
+                               ldb_modify_default_callback,
+                               NULL);
+       LDB_REQ_SET_LOCATION(sub_req);
+       if (ret != LDB_SUCCESS) {
+               return ldb_module_operr(module);
+       }
+
+       ldb_req_mark_trusted(sub_req);
+
+       ret = ldb_request_add_control(sub_req,
+                                     DSDB_CONTROL_SEC_DESC_PROPAGATION_OID,
+                                     true, module);
+       if (ret != LDB_SUCCESS) {
+               return ldb_module_operr(module);
+       }
+
+       sd_propagation_control = ldb_request_get_control(sub_req,
+                                       DSDB_CONTROL_SEC_DESC_PROPAGATION_OID);
+       if (sd_propagation_control == NULL) {
+               return ldb_module_operr(module);
+       }
+
+       ret = dsdb_request_add_controls(sub_req,
+                                       DSDB_FLAG_AS_SYSTEM |
+                                       DSDB_SEARCH_SHOW_RECYCLED);
+       if (ret != LDB_SUCCESS) {
+               return ldb_module_operr(module);
+       }
+
+       ret = descriptor_modify(module, sub_req);
+       if (ret == LDB_SUCCESS) {
+               ret = ldb_wait(sub_req->handle, LDB_WAIT_ALL);
+       }
+       if (ret != LDB_SUCCESS) {
+               ldb_asprintf_errstring(ldb_module_get_ctx(module),
+                                      "descriptor_modify on %s failed: %s",
+                                      ldb_dn_get_linearized(msg->dn),
+                                      ldb_errstring(ldb_module_get_ctx(module)));
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       if (sd_propagation_control->critical != 0) {
+               *stop = true;
+       }
+
+       talloc_free(mod_res);
+
+       return LDB_SUCCESS;
+}
+
+static int descriptor_sd_propagation_msg_sort(struct ldb_message **m1,
+                                             struct ldb_message **m2)
+{
+       struct ldb_dn *dn1 = (*m1)->dn;
+       struct ldb_dn *dn2 = (*m2)->dn;
 
-_PUBLIC_ const struct ldb_module_ops ldb_descriptor_module_ops = {
-       .name          = "descriptor",
-       .search        = descriptor_search,
-       .add           = descriptor_change,
-       .modify        = descriptor_change,
-       .rename        = descriptor_rename,
-       .init_context  = descriptor_init
-};
+       /*
+        * This sorts in tree order, parents first
+        */
+       return ldb_dn_compare(dn2, dn1);
+}
+
+static int descriptor_sd_propagation_recursive(struct ldb_module *module,
+                                              struct descriptor_changes *change)
+{
+       struct descriptor_data *descriptor_private =
+               talloc_get_type_abort(ldb_module_get_private(module),
+               struct descriptor_data);
+       struct descriptor_transaction *t = &descriptor_private->transaction;
+       struct ldb_result *guid_res = NULL;
+       struct ldb_result *res = NULL;
+       unsigned int i;
+       const char * const no_attrs[] = { "@__NONE__", NULL };
+       struct ldb_dn *stopped_dn = NULL;
+       struct GUID_txt_buf guid_buf;
+       int ret;
+       bool stop = false;
+
+       t->changes.num_processed += 1;
+
+       /*
+        * First confirm this object has children, or exists
+        * (depending on change->force_self)
+        * 
+        * LDB_SCOPE_SUBTREE searches are expensive.
+        *
+        * We know this is safe against a rename race as we are in the
+        * prepare_commit(), so must be in a transaction.
+        */
+
+       /* Find the DN by GUID, as this is stable under rename */
+       ret = dsdb_module_search(module,
+                                change,
+                                &guid_res,
+                                change->nc_root,
+                                LDB_SCOPE_SUBTREE,
+                                no_attrs,
+                                DSDB_FLAG_NEXT_MODULE |
+                                DSDB_FLAG_AS_SYSTEM |
+                                DSDB_SEARCH_SHOW_DELETED |
+                                DSDB_SEARCH_SHOW_RECYCLED,
+                                NULL, /* parent_req */
+                                "(objectGUID=%s)",
+                                GUID_buf_string(&change->guid,
+                                                &guid_buf));
+
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
+
+       if (guid_res->count != 1) {
+               /*
+                * We were just given this GUID during the same
+                * transaction, if it is missing this is a big
+                * problem.
+                *
+                * Cleanup of tombstones does not trigger this module
+                * as it just does a delete.
+                */
+               ldb_asprintf_errstring(ldb_module_get_ctx(module),
+                                      "failed to find GUID %s under %s "
+                                      "for transaction-end SD inheritance: %d results",
+                                      GUID_buf_string(&change->guid,
+                                                      &guid_buf),
+                                      ldb_dn_get_linearized(change->nc_root),
+                                      guid_res->count);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       /*
+        * OK, so there was a parent, are there children?  Note: that
+        * this time we do not search for deleted/recycled objects
+        */
+       ret = dsdb_module_search(module,
+                                change,
+                                &res,
+                                guid_res->msgs[0]->dn,
+                                LDB_SCOPE_ONELEVEL,
+                                no_attrs,
+                                DSDB_FLAG_NEXT_MODULE |
+                                DSDB_FLAG_AS_SYSTEM,
+                                NULL, /* parent_req */
+                                "(objectClass=*)");
+       if (ret != LDB_SUCCESS) {
+               /*
+                * LDB_ERR_NO_SUCH_OBJECT, say if the DN was a deleted
+                * object, is ignored by the caller
+                */
+               return ret;
+       }
+
+       if (res->count == 0 && !change->force_self) {
+               /* All done, no children */
+               TALLOC_FREE(res);
+               return LDB_SUCCESS;
+       }
 
+       /*
+        * First, if we are in force_self mode (eg renamed under new
+        * parent) then apply the SD to the top object
+        */
+       if (change->force_self) {
+               ret = descriptor_sd_propagation_object(module,
+                                                      guid_res->msgs[0],
+                                                      &stop);
+               if (ret != LDB_SUCCESS) {
+                       TALLOC_FREE(guid_res);
+                       return ret;
+               }
 
+               if (stop == true && !change->force_children) {
+                       /* There was no change, nothing more to do */
+                       TALLOC_FREE(guid_res);
+                       return LDB_SUCCESS;
+               }
+
+               if (res->count == 0) {
+                       /* All done! */
+                       TALLOC_FREE(guid_res);
+                       return LDB_SUCCESS;
+               }
+       }
+
+       /*
+        * Look for children
+        *
+        * Note: that we do not search for deleted/recycled objects
+        */
+       ret = dsdb_module_search(module,
+                                change,
+                                &res,
+                                guid_res->msgs[0]->dn,
+                                LDB_SCOPE_SUBTREE,
+                                no_attrs,
+                                DSDB_FLAG_NEXT_MODULE |
+                                DSDB_FLAG_AS_SYSTEM,
+                                NULL, /* parent_req */
+                                "(objectClass=*)");
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
+
+       TYPESAFE_QSORT(res->msgs, res->count,
+                      descriptor_sd_propagation_msg_sort);
+
+       /* We start from 1, the top object has been done */
+       for (i = 1; i < res->count; i++) {
+               /*
+                * ldb_dn_compare_base() does not match for NULL but
+                * this is clearer
+                */
+               if (stopped_dn != NULL) {
+                       ret = ldb_dn_compare_base(stopped_dn,
+                                                 res->msgs[i]->dn);
+                       /*
+                        * Skip further processing of this
+                        * sub-subtree
+                        */
+                       if (ret == 0) {
+                               continue;
+                       }
+               }
+               ret = descriptor_sd_propagation_object(module,
+                                                      res->msgs[i],
+                                                      &stop);
+               if (ret != LDB_SUCCESS) {
+                       return ret;
+               }
+
+               if (stop) {
+                       /*
+                        * If this child didn't change, then nothing
+                        * under it needs to change
+                        *
+                        * res has been sorted into tree order so the
+                        * next few entries can be skipped
+                        */
+                       stopped_dn = res->msgs[i]->dn;
+               }
+       }
+
+       TALLOC_FREE(res);
+       return LDB_SUCCESS;
+}
+
+static int descriptor_start_transaction(struct ldb_module *module)
+{
+       struct descriptor_data *descriptor_private =
+               talloc_get_type_abort(ldb_module_get_private(module),
+               struct descriptor_data);
+       struct descriptor_transaction *t = &descriptor_private->transaction;
+
+       if (t->mem != NULL) {
+               return ldb_module_operr(module);
+       }
+
+       *t = (struct descriptor_transaction) { .mem = NULL, };
+       t->mem = talloc_new(descriptor_private);
+       if (t->mem == NULL) {
+               return ldb_module_oom(module);
+       }
+       t->changes.map = db_open_rbt(t->mem);
+       if (t->changes.map == NULL) {
+               TALLOC_FREE(t->mem);
+               *t = (struct descriptor_transaction) { .mem = NULL, };
+               return ldb_module_oom(module);
+       }
+
+       return ldb_next_start_trans(module);
+}
+
+static int descriptor_prepare_commit(struct ldb_module *module)
+{
+       struct descriptor_data *descriptor_private =
+               talloc_get_type_abort(ldb_module_get_private(module),
+               struct descriptor_data);
+       struct descriptor_transaction *t = &descriptor_private->transaction;
+       struct descriptor_changes *c, *n;
+       int ret;
+
+       DBG_NOTICE("changes: num_registrations=%zu\n",
+                  t->changes.num_registrations);
+       DBG_NOTICE("changes: num_registered=%zu\n",
+                  t->changes.num_registered);
+
+       for (c = t->changes.list; c; c = n) {
+               n = c->next;
+
+               DLIST_REMOVE(t->changes.list, c);
+
+               ret = descriptor_sd_propagation_recursive(module, c);
+               if (ret == LDB_ERR_NO_SUCH_OBJECT) {
+                       continue;
+               }
+               if (ret != LDB_SUCCESS) {
+                       return ret;
+               }
+       }
+
+       DBG_NOTICE("changes: num_processed=%zu\n", t->changes.num_processed);
+       DBG_NOTICE("objects: num_processed=%zu\n", t->objects.num_processed);
+
+       return ldb_next_prepare_commit(module);
+}
+
+static int descriptor_end_transaction(struct ldb_module *module)
+{
+       struct descriptor_data *descriptor_private =
+               talloc_get_type_abort(ldb_module_get_private(module),
+               struct descriptor_data);
+       struct descriptor_transaction *t = &descriptor_private->transaction;
+
+       TALLOC_FREE(t->mem);
+       *t = (struct descriptor_transaction) { .mem = NULL, };
+
+       return ldb_next_end_trans(module);
+}
+
+static int descriptor_del_transaction(struct ldb_module *module)
+{
+       struct descriptor_data *descriptor_private =
+               talloc_get_type_abort(ldb_module_get_private(module),
+               struct descriptor_data);
+       struct descriptor_transaction *t = &descriptor_private->transaction;
+
+       TALLOC_FREE(t->mem);
+       *t = (struct descriptor_transaction) { .mem = NULL, };
+
+       return ldb_next_del_trans(module);
+}
+
+static const struct ldb_module_ops ldb_descriptor_module_ops = {
+       .name              = "descriptor",
+       .search            = descriptor_search,
+       .add               = descriptor_add,
+       .modify            = descriptor_modify,
+       .rename            = descriptor_rename,
+       .init_context      = descriptor_init,
+       .extended          = descriptor_extended,
+       .start_transaction = descriptor_start_transaction,
+       .prepare_commit    = descriptor_prepare_commit,
+       .end_transaction   = descriptor_end_transaction,
+       .del_transaction   = descriptor_del_transaction,
+};
+
+int ldb_descriptor_module_init(const char *version)
+{
+       LDB_MODULE_CHECK_VERSION(version);
+       return ldb_register_module(&ldb_descriptor_module_ops);
+}