s4:acl LDB module - move a "mem_ctx" creation to the place where it is actually checked
[kamenim/samba.git] / source4 / dsdb / samdb / ldb_modules / acl.c
index 2f123145dbae22b4c3e1a97010036c4cf0083deb..39b8e9911fb33f528847c2798904662df5ecee6a 100644 (file)
@@ -1,22 +1,22 @@
 /*
-   ldb database library
+  ldb database library
 
-   Copyright (C) Simo Sorce 2006-2008
-   Copyright (C) Nadezhda Ivanova 2009
-   Copyright (C) Anatoliy Atanasov  2009
+  Copyright (C) Simo Sorce 2006-2008
+  Copyright (C) Nadezhda Ivanova 2009
+  Copyright (C) Anatoliy Atanasov  2009
 
-    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 3 of the License, or
+  (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
 #include "ldb_module.h"
 #include "auth/auth.h"
 #include "libcli/security/security.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "param/param.h"
-
-/* acl_search helper */
-struct acl_context {
-
-       struct ldb_module *module;
-       struct ldb_request *req;
-       struct ldb_request *down_req;
-
-       /*needed if we have to identify if this is SYSTEM_USER*/
-       enum security_user_level user_type;
-
-       uint32_t access_needed;
-       struct ldb_dn * dn_to_check;
-
-       /* set to true when we need to process the request as a SYSTEM_USER, regardless
-        * of the user's actual rights - for example when we need to retrieve the
-        * ntSecurityDescriptor */
-       bool ignore_security;
-       struct security_token *token;
-       /*needed to identify if we have requested these attributes*/
-       bool nTSecurityDescriptor;
-       bool objectClass;
-       int sec_result;
-};
+#include "dsdb/samdb/ldb_modules/util.h"
+#include "lib/util/tsort.h"
 
 struct extended_access_check_attribute {
        const char *oa_name;
        const uint32_t requires_rights;
 };
 
-struct acl_private{
-       bool perform_check;
+struct acl_private {
+       bool acl_perform;
+       const char **password_attrs;
 };
 
-static int acl_search_callback(struct ldb_request *req, struct ldb_reply *ares);
-
-/*FIXME: Perhaps this should go in the .idl file*/
-#define SEC_GENERIC_ACCESS_NEVER_GRANTED ( 0xFFFFFFFF )
-
-/*Contains a part of the attributes - the ones that have predefined required rights*/
-static const struct extended_access_check_attribute extended_access_checks_table[] =
-{
-       {
-               .oa_name = "nTSecurityDescriptor",
-               .requires_rights = SEC_FLAG_SYSTEM_SECURITY & SEC_STD_READ_CONTROL,
-       },
-       {
-                .oa_name = "pekList",
-                .requires_rights = SEC_GENERIC_ACCESS_NEVER_GRANTED,
-        },
-       {
-                .oa_name = "currentValue",
-                .requires_rights = SEC_GENERIC_ACCESS_NEVER_GRANTED,
-       },
-       {
-                .oa_name = "dBCSPwd",
-                .requires_rights = SEC_GENERIC_ACCESS_NEVER_GRANTED,
-       },
-       {
-                .oa_name = "unicodePwd",
-                .requires_rights = SEC_GENERIC_ACCESS_NEVER_GRANTED,
-       },
-       {
-                .oa_name = "ntPwdHistory",
-                .requires_rights = SEC_GENERIC_ACCESS_NEVER_GRANTED,
-       },
-       {
-                .oa_name = "priorValue",
-                .requires_rights = SEC_GENERIC_ACCESS_NEVER_GRANTED,
-       },
-       {
-                .oa_name = "supplementalCredentials",
-                .requires_rights = SEC_GENERIC_ACCESS_NEVER_GRANTED,
-       },
-       {
-                .oa_name = "trustAuthIncoming",
-                .requires_rights = SEC_GENERIC_ACCESS_NEVER_GRANTED,
-       },
-       {
-                .oa_name = "trustAuthOutgoing",
-                .requires_rights = SEC_GENERIC_ACCESS_NEVER_GRANTED,
-       },
-       {
-                .oa_name = "ImPwdHistory",
-                .requires_rights = SEC_GENERIC_ACCESS_NEVER_GRANTED,
-       },
-       {
-                .oa_name = "initialAuthIncoming",
-                .requires_rights = SEC_GENERIC_ACCESS_NEVER_GRANTED,
-       },
-       {
-                .oa_name = "initialAuthOutgoing",
-                .requires_rights = SEC_GENERIC_ACCESS_NEVER_GRANTED,
-       },
-       {
-                .oa_name = "msDS-ExecuteScriptPassword",
-                .requires_rights = SEC_GENERIC_ACCESS_NEVER_GRANTED,
-       },
+struct acl_context {
+       struct ldb_module *module;
+       struct ldb_request *req;
+       bool am_system;
+       bool allowedAttributes;
+       bool allowedAttributesEffective;
+       bool allowedChildClasses;
+       bool allowedChildClassesEffective;
+       bool sDRightsEffective;
+       const char * const *attrs;
+       struct dsdb_schema *schema;
 };
 
-static NTSTATUS extended_access_check(const char *attribute_name, const int access_rights, uint32_t searchFlags)
+bool is_root_base_dn(struct ldb_context *ldb, struct ldb_dn *dn_to_check)
 {
-       int i = 0;
-       if (access_rights == SEC_GENERIC_ACCESS_NEVER_GRANTED) {
-               return NT_STATUS_ACCESS_DENIED;
-       }
-
-       /*Check if the attribute is in the table first*/
-       for ( i = 0; extended_access_checks_table[i].oa_name; i++ ) {
-               if (ldb_attr_cmp(extended_access_checks_table[i].oa_name, attribute_name) == 0) {
-                       if ((access_rights & extended_access_checks_table[i].requires_rights) == access_rights) {
-                               return NT_STATUS_OK;
-                       } else {
-                               return NT_STATUS_ACCESS_DENIED;
-                       }
-               }
-       }
+       int result;
+       struct ldb_dn *root_base_dn = ldb_get_root_basedn(ldb);
+       result = ldb_dn_compare(root_base_dn,dn_to_check);
+       return (result==0);
+}
 
-       /*Check for attribute whose attributeSchema has 0x80 set in searchFlags*/
-       if ((searchFlags & SEARCH_FLAG_CONFIDENTIAL) == SEARCH_FLAG_CONFIDENTIAL) {
-               if (((SEC_ADS_READ_PROP & SEC_ADS_CONTROL_ACCESS) & access_rights) == access_rights) {
-                       return NT_STATUS_OK;
-               } else {
-                       return NT_STATUS_ACCESS_DENIED;
-               }
+static struct security_token *acl_user_token(struct ldb_module *module)
+{
+       struct ldb_context *ldb = ldb_module_get_ctx(module);
+       struct auth_session_info *session_info
+               = (struct auth_session_info *)ldb_get_opaque(ldb, "sessionInfo");
+       if(!session_info) {
+               return NULL;
        }
+       return session_info->security_token;
+}
 
-       /*Check attributes with *special* behaviour*/
-       if (ldb_attr_cmp("msDS-QuotaEffective", attribute_name) == 0 || ldb_attr_cmp("msDS-QuotaUsed", attribute_name) == 0){
-               /*Rights required:
-                *
-                *(RIGHT_DS_READ_PROPERTY on the Quotas container or
-                *((the client is querying the quota for the security principal it is authenticated as) and
-                *(DS-Query-Self-Quota control access right on the Quotas container))
-                */
-       }
+/* performs an access check from inside the module stack
+ * given the dn of the object to be checked, the required access
+ * guid is either the guid of the extended right, or NULL
+ */
 
-        if (ldb_attr_cmp("userPassword", attribute_name) == 0) {
-               /*When the dSHeuristics.fUserPwdSupport flag is false, the requester must be granted RIGHT_DS_READ_PROPERTY.
-                *When the dSHeuristics.fUserPwdSupport flag is true, access is never granted.
-                */
+int dsdb_module_check_access_on_dn(struct ldb_module *module,
+                                  TALLOC_CTX *mem_ctx,
+                                  struct ldb_dn *dn,
+                                  uint32_t access,
+                                  const struct GUID *guid)
+{
+       int ret;
+       struct ldb_result *acl_res;
+       static const char *acl_attrs[] = {
+               "nTSecurityDescriptor",
+               "objectSid",
+               NULL
+       };
+       struct ldb_context *ldb = ldb_module_get_ctx(module);
+       struct auth_session_info *session_info
+               = (struct auth_session_info *)ldb_get_opaque(ldb, "sessionInfo");
+       if(!session_info) {
+               return ldb_operr(ldb);
        }
-
-       if (ldb_attr_cmp("sDRightsEffective", attribute_name) == 0) {
-               /*FIXME:3.1.1.4.5.4 in MS-ADTS*/
+       ret = dsdb_module_search_dn(module, mem_ctx, &acl_res, dn,
+                                   acl_attrs,
+                                   DSDB_FLAG_NEXT_MODULE |
+                                   DSDB_SEARCH_SHOW_DELETED);
+       if (ret != LDB_SUCCESS) {
+               DEBUG(10,("access_check: failed to find object %s\n", ldb_dn_get_linearized(dn)));
+               return ret;
        }
+       return dsdb_check_access_on_dn_internal(ldb, acl_res,
+                                               mem_ctx,
+                                               session_info->security_token,
+                                               dn,
+                                               access,
+                                               guid);
+}
 
-       if (ldb_attr_cmp("allowedChildClassesEffective", attribute_name) == 0) {
-               /*FIXME:3.1.1.4.5.5 in MS-ADTS*/
-        }
-
-       if (ldb_attr_cmp("allowedAttributesEffective", attribute_name) == 0) {
-               /*FIXME:3.1.1.4.5.7 in MS-ADTS*/
-        }
-
-       if (ldb_attr_cmp("msDS-Approx-Immed-Subordinates", attribute_name) == 0) {
-               /*FIXME:3.1.1.4.5.15 in MS-ADTS*/
-        }
-
-       if (ldb_attr_cmp("msDS-QuotaEffective", attribute_name) == 0) {
-               /*FIXME:3.1.1.4.5.22 in MS-ADTS*/
-        }
-
-       if (ldb_attr_cmp("msDS-ReplAttributeMetaData", attribute_name) == 0 || ldb_attr_cmp("msDS-ReplAttributeMetaData", attribute_name) == 0) {
-               /*The security context of the requester must be granted the following rights on the replPropertyMetaData attribute:
-                *(RIGHT_DS_READ_PROPERTY)or (DS-Replication-Manage-Topology by ON!nTSecurityDescriptor)
-                */
-        }
-
-       if (ldb_attr_cmp("msDS-NCReplInboundNeighbors", attribute_name) == 0) {
-               /*The security context of the requester must be granted the following rights on repsFrom:
-                *(RIGHT_DS_READ_PROPERTY) or (DS-Replication-Manage-Topology) or (DS-Replication-Monitor-Topology)
-                */
-        }
-
-       if (ldb_attr_cmp("msDS-NCReplOutboundNeighbors", attribute_name) == 0) {
-               /*The security context of the requester must be granted the following rights on repsTo:
-                *(RIGHT_DS_READ_PROPERTY) or (DS-Replication-Manage-Topology) or (DS-Replication-Monitor-Topology)
-                */
-        }
 
-       if (ldb_attr_cmp("msDS-NCReplCursors", attribute_name) == 0) {
-               /*The security context of the requester must be granted the following rights on replUpToDateVector: (RIGHT_DS_READ_PROPERTY)
-                *or (DS-Replication-Manage-Topology) or (DS-Replication-Monitor-Topology)
-                */
-        }
+static int acl_module_init(struct ldb_module *module)
+{
+       struct ldb_context *ldb;
+       struct acl_private *data;
+       int ret, i;
+       TALLOC_CTX *mem_ctx;
+       static const char *attrs[] = { "passwordAttribute", NULL };
+       struct ldb_result *res;
+       struct ldb_message *msg;
+       struct ldb_message_element *password_attributes;
 
-       if (ldb_attr_cmp("msDS-IsUserCachableAtRodc", attribute_name) == 0) {
-               /*The security context of the requester must be granted
-                *the DS-Replication-Secrets-Synchronize control access right on the root of the default NC.
-                */
-        }
+       ldb = ldb_module_get_ctx(module);
 
-       return NT_STATUS_OK;
-}
+       ret = ldb_mod_register_control(module, LDB_CONTROL_SD_FLAGS_OID);
+       if (ret != LDB_SUCCESS) {
+               ldb_debug(ldb, LDB_DEBUG_ERROR,
+                         "acl_module_init: Unable to register control with rootdse!\n");
+               return ldb_operr(ldb);
+       }
 
-/* Builds an object tree for object specific access checks */
-static struct object_tree * build_object_tree_form_attr_list(TALLOC_CTX *mem_ctx,   /* Todo this context or separate? */
-                                                            struct ldb_context *ldb,
-                                                            const char ** attr_names,
-                                                            int num_attrs,
-                                                            const char * object_class,
-                                                            uint32_t init_access)
-{
-       const struct dsdb_schema *schema = dsdb_get_schema(ldb);
-       const struct GUID *oc_guid = class_schemaid_guid_by_lDAPDisplayName(schema, object_class);
-       struct object_tree *tree;
-       int i;
+       data = talloc(module, struct acl_private);
+       if (data == NULL) {
+               return ldb_oom(ldb);
+       }
 
-       if (!oc_guid)
-               return NULL;
+       data->password_attrs = NULL;
+       data->acl_perform = lp_parm_bool(ldb_get_opaque(ldb, "loadparm"),
+                                        NULL, "acl", "perform", false);
+       ldb_module_set_private(module, data);
 
-       tree = insert_in_object_tree(mem_ctx, oc_guid, NULL, init_access, NULL);
-       if (attr_names){
-               for (i=0; i < num_attrs; i++){
-                       const struct dsdb_attribute *attribute = dsdb_attribute_by_lDAPDisplayName(schema,attr_names[i]);
-                       if (attribute)
-                               insert_in_object_tree(mem_ctx,
-                                                     &attribute->schemaIDGUID,
-                                                     &attribute->attributeSecurityGUID,
-                                                     init_access,
-                                                     tree);
-               }
+       mem_ctx = talloc_new(module);
+       if (!mem_ctx) {
+               return ldb_oom(ldb);
        }
-       return tree;
-}
 
-bool is_root_base_dn(struct ldb_context *ldb, struct ldb_dn *dn_to_check)
-{
-       int result;
-       struct ldb_dn *root_base_dn = ldb_get_root_basedn(ldb);
-       result = ldb_dn_compare(root_base_dn,dn_to_check);
-       return (result==0);
-}
+       ret = dsdb_module_search_dn(module, mem_ctx, &res,
+                                   ldb_dn_new(mem_ctx, ldb, "@KLUDGEACL"),
+                                   attrs,
+                                   DSDB_FLAG_NEXT_MODULE);
+       if (ret != LDB_SUCCESS) {
+               goto done;
+       }
+       if (res->count == 0) {
+               goto done;
+       }
 
-static int acl_op_callback(struct ldb_request *req, struct ldb_reply *ares)
-{
-       struct acl_context *ac;
+       if (res->count > 1) {
+               talloc_free(mem_ctx);
+               return LDB_ERR_CONSTRAINT_VIOLATION;
+       }
 
-       ac = talloc_get_type(req->context, struct acl_context);
+       msg = res->msgs[0];
 
-       if (!ares) {
-               return ldb_module_done(ac->req, NULL, NULL,
-                                       LDB_ERR_OPERATIONS_ERROR);
+       password_attributes = ldb_msg_find_element(msg, "passwordAttribute");
+       if (!password_attributes) {
+               goto done;
        }
-       if (ares->error != LDB_SUCCESS) {
-               return ldb_module_done(ac->req, ares->controls,
-                                       ares->response, ares->error);
+       data->password_attrs = talloc_array(data, const char *, password_attributes->num_values + 1);
+       if (!data->password_attrs) {
+               talloc_free(mem_ctx);
+               return ldb_oom(ldb);
        }
-
-       if (ares->type != LDB_REPLY_DONE) {
-               talloc_free(ares);
-               return ldb_module_done(ac->req, NULL, NULL,
-                                       LDB_ERR_OPERATIONS_ERROR);
+       for (i=0; i < password_attributes->num_values; i++) {
+               data->password_attrs[i] = (const char *)password_attributes->values[i].data;
+               talloc_steal(data->password_attrs, password_attributes->values[i].data);
        }
+       data->password_attrs[i] = NULL;
 
-       return ldb_module_done(ac->req, ares->controls,
-                               ares->response, ares->error);
+done:
+       talloc_free(mem_ctx);
+       return ldb_next_init(module);
 }
 
-
-static int acl_access_check_add(struct ldb_reply *ares,
-                               struct acl_context *ac,
-                               struct security_descriptor *sd)
+static const struct GUID *get_oc_guid_from_message(struct ldb_module *module,
+                                                  const struct dsdb_schema *schema,
+                                                  struct ldb_message *msg)
 {
-       uint32_t access_granted = 0;
-       NTSTATUS status;
-       struct ldb_dn *parent;
-       struct ldb_dn *grandparent;
-       struct object_tree *tree = NULL;
-
-       parent = ldb_dn_get_parent(ac->req, ac->req->op.add.message->dn);
-       grandparent = ldb_dn_get_parent(ac->req, parent);
-       if (ldb_dn_compare(ares->message->dn, grandparent) == 0)
-               status = sec_access_check_ds(sd, ac->token,
-                                            SEC_ADS_LIST,
-                                            &access_granted,
-                                            NULL);
-       else if (ldb_dn_compare(ares->message->dn, parent) == 0){
-               struct ldb_message_element *oc_el;
-               struct ldb_context *ldb = ldb_module_get_ctx(ac->module);
-               const struct dsdb_schema *schema = dsdb_get_schema(ldb);
-               int i;
-
-               oc_el = ldb_msg_find_element(ares->message, "objectClass");
-               if (!oc_el || oc_el->num_values == 0)
-                       return LDB_SUCCESS;
-               for (i = 0; i < oc_el->num_values; i++){
-                       const struct GUID *guid = class_schemaid_guid_by_lDAPDisplayName(schema,
-                                                                                         oc_el->values[i].data);
-                       ac->sec_result = LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
-                       tree = insert_in_object_tree(ac->req, guid, NULL, SEC_ADS_CREATE_CHILD,
-                                                    tree);
-                       status = sec_access_check_ds(sd, ac->token, SEC_ADS_CREATE_CHILD,&access_granted, tree);
-                       if (NT_STATUS_IS_OK(status))
-                               ac->sec_result = LDB_SUCCESS;
-               }
+       struct ldb_message_element *oc_el;
+
+       oc_el = ldb_msg_find_element(msg, "objectClass");
+       if (!oc_el) {
+               return NULL;
        }
-       else
-               return LDB_SUCCESS;
 
-       return ac->sec_result;
+       return class_schemaid_guid_by_lDAPDisplayName(schema,
+                                                     (char *)oc_el->values[oc_el->num_values-1].data);
 }
 
-static int acl_access_check_modify(struct ldb_reply *ares, struct acl_context *ac,
-                                  struct security_descriptor *sd)
+static int acl_check_access_on_attribute(struct ldb_module *module,
+                                        TALLOC_CTX *mem_ctx,
+                                        struct security_descriptor *sd,
+                                        struct dom_sid *rp_sid,
+                                        uint32_t access,
+                                        const struct dsdb_attribute *attr)
 {
-       uint32_t access_granted = 0;
+       int ret;
        NTSTATUS status;
-       struct ldb_dn *parent;
-       struct object_tree *tree = NULL;
-
-       parent = ldb_dn_get_parent(ac->req, ac->req->op.add.message->dn);
-       if (ldb_dn_compare(ares->message->dn, parent) == 0)
-               status = sec_access_check_ds(sd, ac->token, SEC_ADS_LIST,&access_granted, NULL);
-       else if (ldb_dn_compare(ares->message->dn, ac->req->op.add.message->dn) == 0){
-               struct ldb_message_element *oc_el;
-               struct ldb_context *ldb = ldb_module_get_ctx(ac->module);
-               const struct dsdb_schema *schema = dsdb_get_schema(ldb);
-               int i;
-               struct GUID *guid;
-               oc_el = ldb_msg_find_element(ares->message, "objectClass");
-               if (!oc_el || oc_el->num_values == 0)
-                       return LDB_SUCCESS;
+       uint32_t access_granted;
+       struct object_tree *root = NULL;
+       struct object_tree *new_node = NULL;
+       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+       struct security_token *token = acl_user_token(module);
+       if (attr) {
+               if (!GUID_all_zero(&attr->attributeSecurityGUID)) {
+                       if (!insert_in_object_tree(tmp_ctx,
+                                                  &attr->attributeSecurityGUID, access,
+                                                  &root, &new_node)) {
+                               DEBUG(10, ("acl_search: cannot add to object tree securityGUID\n"));
+                               goto fail;
+                       }
 
-               guid = class_schemaid_guid_by_lDAPDisplayName(schema,
-                                                             oc_el->values[oc_el->num_values-1].data);
-               tree = insert_in_object_tree(ac->req, guid, NULL, SEC_ADS_WRITE_PROP,
-                                                    tree);
-               for (i=0; i < ac->req->op.mod.message->num_elements; i++){
-                       const struct dsdb_attribute *attr = dsdb_attribute_by_lDAPDisplayName(schema,
-                                                                                             ac->req->op.mod.message->elements[i].name);
-                       if (!attr)
-                               return LDB_ERR_OPERATIONS_ERROR; /* What should we actually return here? */
-                       insert_in_object_tree(ac, &attr->schemaIDGUID,
-                                             &attr->attributeSecurityGUID, ac->access_needed, tree);
+                       if (!insert_in_object_tree(tmp_ctx,
+                                                  &attr->schemaIDGUID, access, &new_node, &new_node)) {
+                               DEBUG(10, ("acl_search: cannot add to object tree attributeGUID\n"));
+                               goto fail;
+                       }
+               }
+               else {
+                       if (!insert_in_object_tree(tmp_ctx,
+                                                  &attr->schemaIDGUID, access, &root, &new_node)) {
+                               DEBUG(10, ("acl_search: cannot add to object tree attributeGUID\n"));
+                               goto fail;
+                       }
                }
-               status = sec_access_check_ds(sd, ac->token, SEC_ADS_WRITE_PROP ,&access_granted, tree);
-               if (!NT_STATUS_IS_OK(status))
-                       ac->sec_result = LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
        }
-       else
-               return LDB_SUCCESS;
-       return ac->sec_result;
-}
-/*TODO*/
-static int acl_access_check_rename(struct ldb_reply *ares, struct acl_context *ac,
-                                  struct security_descriptor *sd)
-{
-       return ac->sec_result;
+       status = sec_access_check_ds(sd, token,
+                                    access,
+                                    &access_granted,
+                                    root,
+                                    rp_sid);
+       if (!NT_STATUS_IS_OK(status)) {
+               ret = LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
+       }
+       else {
+               ret = LDB_SUCCESS;
+       }
+       talloc_free(tmp_ctx);
+       return ret;
+fail:
+       talloc_free(tmp_ctx);
+       return ldb_operr(ldb_module_get_ctx(module));
 }
 
-static int acl_access_check_delete(struct ldb_reply *ares, struct acl_context *ac,
-                                  struct security_descriptor *sd)
+static int acl_check_access_on_class(struct ldb_module *module,
+                                    const struct dsdb_schema *schema,
+                                    TALLOC_CTX *mem_ctx,
+                                    struct security_descriptor *sd,
+                                    struct dom_sid *rp_sid,
+                                    uint32_t access,
+                                    const char *class_name)
 {
-       uint32_t access_granted = 0;
+       int ret;
        NTSTATUS status;
-       struct ldb_dn *parent;
-       struct object_tree *tree = NULL;
-
-       parent = ldb_dn_get_parent(ac->req, ac->req->op.del.dn);
-       if (ldb_dn_compare(ares->message->dn, parent) == 0){
-               status = sec_access_check_ds(sd, ac->token, SEC_ADS_LIST,&access_granted, NULL);
-               if (!NT_STATUS_IS_OK(status)){
-                       ac->sec_result = LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
-                       return ac->sec_result;
+       uint32_t access_granted;
+       struct object_tree *root = NULL;
+       struct object_tree *new_node = NULL;
+       const struct GUID *guid;
+       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+       struct security_token *token = acl_user_token(module);
+       if (class_name) {
+               guid = class_schemaid_guid_by_lDAPDisplayName(schema, class_name);
+               if (!guid) {
+                       DEBUG(10, ("acl_search: cannot find class %s\n",
+                                  class_name));
+                       goto fail;
                }
-               status = sec_access_check_ds(sd, ac->token, SEC_ADS_DELETE_CHILD,&access_granted, NULL);
-               if (NT_STATUS_IS_OK(status)){
-                       ac->sec_result = LDB_SUCCESS;
-                       return ac->sec_result;
+               if (!insert_in_object_tree(tmp_ctx,
+                                          guid, access,
+                                          &root, &new_node)) {
+                       DEBUG(10, ("acl_search: cannot add to object tree guid\n"));
+                       goto fail;
                }
        }
-       else if (ldb_dn_compare(ares->message->dn, ac->req->op.del.dn) == 0){
-               status = sec_access_check_ds(sd, ac->token, SEC_STD_DELETE, &access_granted, NULL);
-               if (!NT_STATUS_IS_OK(status))
-                       ac->sec_result = LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
+       status = sec_access_check_ds(sd, token,
+                                    access,
+                                    &access_granted,
+                                    root,
+                                    rp_sid);
+       if (!NT_STATUS_IS_OK(status)) {
+               ret = LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
        }
-       return ac->sec_result;
+       else {
+               ret = LDB_SUCCESS;
+       }
+       return ret;
+fail:
+       return ldb_operr(ldb_module_get_ctx(module));
 }
 
-static int acl_access_check_search(struct ldb_reply *ares, struct acl_context *ac,
-                                  struct security_descriptor *sd)
+static int acl_allowedAttributes(struct ldb_module *module,
+                                const struct dsdb_schema *schema,
+                                struct ldb_message *sd_msg,
+                                struct ldb_message *msg,
+                                struct acl_context *ac)
 {
-       uint32_t access_granted;
-       NTSTATUS status;
-       struct ldb_dn *parent;
+       struct ldb_message_element *oc_el;
+       struct ldb_context *ldb = ldb_module_get_ctx(module);
+       TALLOC_CTX *mem_ctx;
+       const char **attr_list;
+       int i, ret;
 
-       if (ac->user_type == SECURITY_SYSTEM || ac->user_type == SECURITY_ANONYMOUS) {
-               return LDB_SUCCESS;/*FIXME: we have anonymous access*/
+       /* If we don't have a schema yet, we can't do anything... */
+       if (schema == NULL) {
+               ldb_asprintf_errstring(ldb, "cannot add allowedAttributes to %s because no schema is loaded", ldb_dn_get_linearized(msg->dn));
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       parent = ldb_dn_get_parent(ac->req, ac->dn_to_check);
-       ac->sec_result = LDB_SUCCESS;
-       if (ldb_dn_compare(ares->message->dn, parent) == 0) {
-               status = sec_access_check_ds(sd, ac->token, SEC_ADS_LIST,&access_granted, NULL);
-               if (!NT_STATUS_IS_OK(status)) {
-                       ac->sec_result = LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
-               }
+       /* Must remove any existing attribute */
+       if (ac->allowedAttributes) {
+               ldb_msg_remove_attr(msg, "allowedAttributes");
        }
 
-       return ac->sec_result;
-}
+       mem_ctx = talloc_new(msg);
+       if (!mem_ctx) {
+               return ldb_oom(ldb);
+       }
 
-static int acl_perform_access_check(struct ldb_request *req, struct ldb_reply *ares,
-                                   struct acl_context *ac)
-{
-       struct ldb_message_element *oc_el;
-       struct security_descriptor *sd;
-       enum ndr_err_code ndr_err;
+       oc_el = ldb_msg_find_element(sd_msg, "objectClass");
+       attr_list = dsdb_full_attribute_list(mem_ctx, schema, oc_el, DSDB_SCHEMA_ALL);
+       if (!attr_list) {
+               ldb_asprintf_errstring(ldb, "acl: Failed to get list of attributes");
+               talloc_free(mem_ctx);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+       if (ac->allowedAttributes) {
+               for (i=0; attr_list && attr_list[i]; i++) {
+                       ldb_msg_add_string(msg, "allowedAttributes", attr_list[i]);
+               }
+       }
+       if (ac->allowedAttributesEffective) {
+               struct security_descriptor *sd;
+               struct dom_sid *sid = NULL;
+               struct ldb_control *as_system = ldb_request_get_control(ac->req,
+                                                                       LDB_CONTROL_AS_SYSTEM_OID);
+
+               if (as_system != NULL) {
+                       as_system->critical = 0;
+               }
 
-       oc_el = ldb_msg_find_element(ares->message, "ntSecurityDescriptor");
-       if (!oc_el || oc_el->num_values == 0)
-               return LDB_SUCCESS;
+               ldb_msg_remove_attr(msg, "allowedAttributesEffective");
+               if (ac->am_system || as_system) {
+                       for (i=0; attr_list && attr_list[i]; i++) {
+                               ldb_msg_add_string(msg, "allowedAttributesEffective", attr_list[i]);
+                       }
+                       return LDB_SUCCESS;
+               }
 
-       sd = talloc(ac, struct security_descriptor);
-       if(!sd) {
-               return ldb_module_done(ac->req, ares->controls,
-                                      ares->response, LDB_ERR_OPERATIONS_ERROR);
-       }
-       ndr_err = ndr_pull_struct_blob(&oc_el->values[0], sd, NULL, sd,
-                                      (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
+               ret = dsdb_get_sd_from_ldb_message(ldb_module_get_ctx(module), mem_ctx, sd_msg, &sd);
 
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err))
-               return ldb_module_done(ac->req, ares->controls,
-                                      ares->response, LDB_ERR_OPERATIONS_ERROR);
-       switch (ac->req->operation) {
-       case LDB_SEARCH:
-               return acl_access_check_search(ares, ac, sd);
-       case LDB_ADD:
-               return acl_access_check_add(ares, ac, sd);
-       case LDB_MODIFY:
-               return acl_access_check_modify(ares, ac, sd);
-       case LDB_DELETE:
-               return acl_access_check_delete(ares, ac, sd);
-       case LDB_RENAME:
-               return acl_access_check_rename(ares, ac, sd);
-       default:
-               return ldb_module_done(ac->req, ares->controls,
-                                      ares->response, LDB_ERR_OPERATIONS_ERROR);
+               if (ret != LDB_SUCCESS) {
+                       return ret;
+               }
+
+               sid = samdb_result_dom_sid(mem_ctx, sd_msg, "objectSid");
+               for (i=0; attr_list && attr_list[i]; i++) {
+                       const struct dsdb_attribute *attr = dsdb_attribute_by_lDAPDisplayName(schema,
+                                                                                       attr_list[i]);
+                       if (!attr) {
+                               return ldb_operr(ldb);
+                       }
+                       /* remove constructed attributes */
+                       if (attr->systemFlags & DS_FLAG_ATTR_IS_CONSTRUCTED
+                           || attr->systemOnly
+                           || (attr->linkID != 0 && attr->linkID % 2 != 0 )) {
+                               continue;
+                       }
+                       ret = acl_check_access_on_attribute(module,
+                                                           msg,
+                                                           sd,
+                                                           sid,
+                                                           SEC_ADS_WRITE_PROP,
+                                                           attr);
+                       if (ret == LDB_SUCCESS) {
+                               ldb_msg_add_string(msg, "allowedAttributesEffective", attr_list[i]);
+                       }
+               }
        }
        return LDB_SUCCESS;
 }
 
-static int acl_forward_add(struct ldb_reply *ares,
-                          struct acl_context *ac)
+static int acl_childClasses(struct ldb_module *module,
+                           const struct dsdb_schema *schema,
+                           struct ldb_message *sd_msg,
+                           struct ldb_message *msg,
+                           const char *attrName)
 {
-  struct ldb_request *newreq;
-       struct ldb_context *ldb;
+       struct ldb_message_element *oc_el;
+       struct ldb_message_element *allowedClasses;
+       const struct dsdb_class *sclass;
+       unsigned int i, j;
        int ret;
 
-       ldb = ldb_module_get_ctx(ac->module);
-       ret = ldb_build_add_req(&newreq,ldb,
-                               ac,
-                               ac->req->op.add.message,
-                               ac->req->controls,
-                               ac,
-                               acl_op_callback,
-                               ac->req);
-       if (ret != LDB_SUCCESS)
-               return ldb_module_done(ac->req, ares->controls,
-                                      ares->response, LDB_ERR_OPERATIONS_ERROR);
-       return ldb_next_request(ac->module, newreq);
-}
+       /* If we don't have a schema yet, we can't do anything... */
+       if (schema == NULL) {
+               ldb_asprintf_errstring(ldb_module_get_ctx(module), "cannot add childClassesEffective to %s because no schema is loaded", ldb_dn_get_linearized(msg->dn));
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
 
-static int acl_forward_modify(struct ldb_reply *ares,
-                             struct acl_context *ac)
-{
-  struct ldb_request *newreq;
-       struct ldb_context *ldb;
-       int ret;
+       /* Must remove any existing attribute, or else confusion reins */
+       ldb_msg_remove_attr(msg, attrName);
+       ret = ldb_msg_add_empty(msg, attrName, 0, &allowedClasses);
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
 
-       ldb = ldb_module_get_ctx(ac->module);
-       ret = ldb_build_mod_req(&newreq,ldb,
-                                   ac,
-                                   ac->req->op.mod.message,
-                                   ac->req->controls,
-                                   ac,
-                                   acl_op_callback,
-                                   ac->req);
-       if (ret != LDB_SUCCESS)
-               return ldb_module_done(ac->req, ares->controls,
-                                      ares->response, LDB_ERR_OPERATIONS_ERROR);
-       return ldb_next_request(ac->module, newreq);
-}
+       oc_el = ldb_msg_find_element(sd_msg, "objectClass");
 
-static int acl_forward_delete(struct ldb_reply *ares,
-                             struct acl_context *ac)
-{
-       struct ldb_request *newreq;
-       struct ldb_context *ldb;
-       int ret;
+       for (i=0; oc_el && i < oc_el->num_values; i++) {
+               sclass = dsdb_class_by_lDAPDisplayName_ldb_val(schema, &oc_el->values[i]);
+               if (!sclass) {
+                       /* We don't know this class?  what is going on? */
+                       continue;
+               }
 
-       ldb = ldb_module_get_ctx(ac->module);
-       ret = ldb_build_del_req(&newreq, ldb,
-                                   ac,
-                                   ac->req->op.del.dn,
-                                   ac->req->controls,
-                                   ac,
-                                   acl_op_callback,
-                                   ac->req);
-       if (ret != LDB_SUCCESS)
-               return ldb_module_done(ac->req, ares->controls,
-                                      ares->response, LDB_ERR_OPERATIONS_ERROR);
-       return ldb_next_request(ac->module, newreq);
-}
+               for (j=0; sclass->possibleInferiors && sclass->possibleInferiors[j]; j++) {
+                       ldb_msg_add_string(msg, attrName, sclass->possibleInferiors[j]);
+               }
+       }
+       if (allowedClasses->num_values > 1) {
+               TYPESAFE_QSORT(allowedClasses->values, allowedClasses->num_values, data_blob_cmp);
+               for (i=1 ; i < allowedClasses->num_values; i++) {
+                       struct ldb_val *val1 = &allowedClasses->values[i-1];
+                       struct ldb_val *val2 = &allowedClasses->values[i];
+                       if (data_blob_cmp(val1, val2) == 0) {
+                               memmove(val1, val2, (allowedClasses->num_values - i) * sizeof(struct ldb_val));
+                               allowedClasses->num_values--;
+                               i--;
+                       }
+               }
+       }
 
-static int acl_forward_rename(struct ldb_reply *ares,
-                             struct acl_context *ac)
-{
        return LDB_SUCCESS;
 }
 
-static int acl_forward_search(struct acl_context *ac)
+static int acl_childClassesEffective(struct ldb_module *module,
+                                    const struct dsdb_schema *schema,
+                                    struct ldb_message *sd_msg,
+                                    struct ldb_message *msg,
+                                    struct acl_context *ac)
 {
+       struct ldb_message_element *oc_el;
+       struct ldb_message_element *allowedClasses = NULL;
+       const struct dsdb_class *sclass;
+       struct security_descriptor *sd;
+       struct ldb_control *as_system = ldb_request_get_control(ac->req,
+                                                               LDB_CONTROL_AS_SYSTEM_OID);
+       struct dom_sid *sid = NULL;
+       unsigned int i, j;
        int ret;
-       const char * const *attrs;
-       struct ldb_control *sd_control;
-       struct ldb_control **sd_saved_controls;
-       struct ldb_context *ldb;
-       struct ldb_request *newreq;
 
-       ldb = ldb_module_get_ctx(ac->module);
-       attrs = ac->req->op.search.attrs;
-       if (attrs) {
-               ac->nTSecurityDescriptor = false;
-               ac->objectClass = false;
-               if (!ldb_attr_in_list(ac->req->op.search.attrs, "nTSecurityDescriptor")) {
-                       attrs = ldb_attr_list_copy_add(ac, attrs, "nTSecurityDescriptor");
-                       ac->nTSecurityDescriptor = true;
-               }
-               if (!ldb_attr_in_list(ac->req->op.search.attrs, "objectClass")) {
-                       attrs = ldb_attr_list_copy_add(ac, attrs, "objectClass");
-                       ac->objectClass = true;
-               }
+       if (as_system != NULL) {
+               as_system->critical = 0;
        }
-       ret = ldb_build_search_req_ex(&newreq,ldb,
-                                     ac,
-                                     ac->req->op.search.base,
-                                     ac->req->op.search.scope,
-                                     ac->req->op.search.tree,
-                                     attrs,
-                                     ac->req->controls,
-                                     ac, acl_search_callback,
-                                     ac->req);
+
+       if (ac->am_system || as_system) {
+               return acl_childClasses(module, schema, sd_msg, msg, "allowedChildClassesEffective");
+       }
+
+       /* If we don't have a schema yet, we can't do anything... */
+       if (schema == NULL) {
+               ldb_asprintf_errstring(ldb_module_get_ctx(module), "cannot add allowedChildClassesEffective to %s because no schema is loaded", ldb_dn_get_linearized(msg->dn));
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       /* Must remove any existing attribute, or else confusion reins */
+       ldb_msg_remove_attr(msg, "allowedChildClassesEffective");
+
+       oc_el = ldb_msg_find_element(sd_msg, "objectClass");
+       ret = dsdb_get_sd_from_ldb_message(ldb_module_get_ctx(module), msg, sd_msg, &sd);
        if (ret != LDB_SUCCESS) {
-                return LDB_ERR_OPERATIONS_ERROR;
-       }
-       /* check if there's an SD_FLAGS control */
-       sd_control = ldb_request_get_control(newreq, LDB_CONTROL_SD_FLAGS_OID);
-       if (sd_control) {
-               /* 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 (!save_controls(sd_control, newreq, &sd_saved_controls)) {
-                       return LDB_ERR_OPERATIONS_ERROR;
+               return ret;
+       }
+
+       sid = samdb_result_dom_sid(msg, sd_msg, "objectSid");
+       for (i=0; oc_el && i < oc_el->num_values; i++) {
+               sclass = dsdb_class_by_lDAPDisplayName_ldb_val(schema, &oc_el->values[i]);
+               if (!sclass) {
+                       /* We don't know this class?  what is going on? */
+                       continue;
+               }
+
+               for (j=0; sclass->possibleInferiors && sclass->possibleInferiors[j]; j++) {
+                       ret = acl_check_access_on_class(module,
+                                                       schema,
+                                                       msg,
+                                                       sd,
+                                                       sid,
+                                                       SEC_ADS_CREATE_CHILD,
+                                                       sclass->possibleInferiors[j]);
+                       if (ret == LDB_SUCCESS) {
+                               ldb_msg_add_string(msg, "allowedChildClassesEffective",
+                                                  sclass->possibleInferiors[j]);
+                       }
                }
        }
-       return ldb_next_request(ac->module, newreq);
-}
+       allowedClasses = ldb_msg_find_element(msg, "allowedChildClassesEffective");
+       if (!allowedClasses) {
+               return LDB_SUCCESS;
+       }
 
-static int acl_forward_request(struct ldb_reply *ares,
-                              struct acl_context *ac)
-{
-       switch (ac->req->operation) {
-       case LDB_SEARCH:
-               return acl_forward_search(ac);
-       case LDB_ADD:
-               return acl_forward_add(ares,ac);
-       case LDB_MODIFY:
-               return acl_forward_modify(ares,ac);
-       case LDB_DELETE:
-               return acl_forward_delete(ares,ac);
-       case LDB_RENAME:
-               return acl_forward_rename(ares,ac);
-       default:
-               return ldb_module_done(ac->req, ares->controls,
-                                      ares->response, LDB_ERR_OPERATIONS_ERROR);
+       if (allowedClasses->num_values > 1) {
+               TYPESAFE_QSORT(allowedClasses->values, allowedClasses->num_values, data_blob_cmp);
+               for (i=1 ; i < allowedClasses->num_values; i++) {
+                       struct ldb_val *val1 = &allowedClasses->values[i-1];
+                       struct ldb_val *val2 = &allowedClasses->values[i];
+                       if (data_blob_cmp(val1, val2) == 0) {
+                               memmove(val1, val2, (allowedClasses->num_values - i) * sizeof( struct ldb_val));
+                               allowedClasses->num_values--;
+                               i--;
+                       }
+               }
        }
        return LDB_SUCCESS;
 }
 
-static int acl_visible_callback(struct ldb_request *req, struct ldb_reply *ares)
+static int acl_sDRightsEffective(struct ldb_module *module,
+                                struct ldb_message *sd_msg,
+                                struct ldb_message *msg,
+                                struct acl_context *ac)
 {
-       struct acl_context *ac;
-
-       ac = talloc_get_type(req->context, struct acl_context);
+       struct ldb_message_element *rightsEffective;
+       int ret;
+       struct security_descriptor *sd;
+       struct ldb_control *as_system = ldb_request_get_control(ac->req,
+                                                               LDB_CONTROL_AS_SYSTEM_OID);
+       struct dom_sid *sid = NULL;
+       uint32_t flags = 0;
 
-       if (!ares) {
-               return ldb_module_done(ac->req, NULL, NULL,
-                                       LDB_ERR_OPERATIONS_ERROR);
+       if (as_system != NULL) {
+               as_system->critical = 0;
        }
 
-       if (ares->error != LDB_SUCCESS) {
-               return ldb_module_done(ac->req, ares->controls,
-                                       ares->response, ares->error);
+       /* Must remove any existing attribute, or else confusion reins */
+       ldb_msg_remove_attr(msg, "sDRightsEffective");
+       ret = ldb_msg_add_empty(msg, "sDRightsEffective", 0, &rightsEffective);
+       if (ret != LDB_SUCCESS) {
+               return ret;
        }
-
-       switch (ares->type) {
-       case LDB_REPLY_ENTRY:
-               return acl_perform_access_check(req, ares, ac);
-       case LDB_REPLY_REFERRAL:
-               return ldb_module_send_referral(ac->req, ares->referral); /* what to do here actually? */
-       case LDB_REPLY_DONE:
-               if (ac->sec_result != LDB_SUCCESS) {
-                       return ldb_module_done(ac->req, ares->controls,
-                                               ares->response, ac->sec_result);
+       if (ac->am_system || as_system) {
+               flags = SECINFO_OWNER | SECINFO_GROUP |  SECINFO_SACL |  SECINFO_DACL;
+       }
+       else {
+               /* Get the security descriptor from the message */
+               ret = dsdb_get_sd_from_ldb_message(ldb_module_get_ctx(module), msg, sd_msg, &sd);
+               if (ret != LDB_SUCCESS) {
+                       return ret;
+               }
+               sid = samdb_result_dom_sid(msg, sd_msg, "objectSid");
+               ret = acl_check_access_on_attribute(module,
+                                                   msg,
+                                                   sd,
+                                                   sid,
+                                                   SEC_STD_WRITE_OWNER,
+                                                   NULL);
+               if (ret == LDB_SUCCESS) {
+                       flags |= SECINFO_OWNER | SECINFO_GROUP;
+               }
+               ret = acl_check_access_on_attribute(module,
+                                                   msg,
+                                                   sd,
+                                                   sid,
+                                                   SEC_STD_WRITE_DAC,
+                                                   NULL);
+               if (ret == LDB_SUCCESS) {
+                       flags |= SECINFO_DACL;
+               }
+               ret = acl_check_access_on_attribute(module,
+                                                   msg,
+                                                   sd,
+                                                   sid,
+                                                   SEC_FLAG_SYSTEM_SECURITY,
+                                                   NULL);
+               if (ret == LDB_SUCCESS) {
+                       flags |= SECINFO_SACL;
                }
-               return acl_forward_request(ares,ac);
-       default:
-               break;
        }
+       ldb_msg_add_fmt(msg, "sDRightsEffective", "%u", flags);
        return LDB_SUCCESS;
 }
 
-static enum security_user_level what_is_user(struct ldb_module *module)
+static int acl_add(struct ldb_module *module, struct ldb_request *req)
 {
-       struct ldb_context *ldb = ldb_module_get_ctx(module);
-       struct auth_session_info *session_info
-               = (struct auth_session_info *)ldb_get_opaque(ldb, "sessionInfo");
-       return security_session_user_level(session_info);
-}
+       int ret;
+       struct ldb_dn *parent = ldb_dn_get_parent(req, req->op.add.message->dn);
+       struct ldb_context *ldb;
+       const struct dsdb_schema *schema;
+       struct ldb_message_element *oc_el;
+       const struct GUID *guid;
+       struct ldb_control *as_system = ldb_request_get_control(req, LDB_CONTROL_AS_SYSTEM_OID);
 
-static struct security_token * user_token(struct ldb_module *module)
-{
-       struct ldb_context *ldb = ldb_module_get_ctx(module);
-       struct auth_session_info *session_info
-               = (struct auth_session_info *)ldb_get_opaque(ldb, "sessionInfo");
-       if(!session_info) {
-               return NULL;
+       if (as_system != NULL) {
+               as_system->critical = 0;
+       }
+
+       if (dsdb_module_am_system(module) || as_system) {
+               return ldb_next_request(module, req);
+       }
+
+       if (ldb_dn_is_special(req->op.add.message->dn)) {
+               return ldb_next_request(module, req);
+       }
+       ldb = ldb_module_get_ctx(module);
+       /* Creating an NC. There is probably something we should do here,
+        * but we will establish that later */
+       /* FIXME: this has to be made dynamic at some point */
+       if ((ldb_dn_compare(req->op.add.message->dn, (ldb_get_schema_basedn(ldb))) == 0) ||
+           (ldb_dn_compare(req->op.add.message->dn, (ldb_get_config_basedn(ldb))) == 0) ||
+           (ldb_dn_compare(req->op.add.message->dn, (ldb_get_default_basedn(ldb))) == 0) ||
+           (ldb_dn_compare(req->op.add.message->dn, (ldb_get_root_basedn(ldb))) == 0)) {
+               return ldb_next_request(module, req);
+       }
+
+       schema = dsdb_get_schema(ldb, req);
+       if (!schema) {
+               return ldb_operr(ldb);
+       }
+
+       oc_el = ldb_msg_find_element(req->op.add.message, "objectClass");
+       if (!oc_el || oc_el->num_values == 0) {
+               DEBUG(10,("acl:operation error %s\n", ldb_dn_get_linearized(req->op.add.message->dn)));
+               return ldb_module_done(req, NULL, NULL, LDB_ERR_OPERATIONS_ERROR);
        }
-       return session_info->security_token;
-}
 
+       guid = class_schemaid_guid_by_lDAPDisplayName(schema,
+                                                     (char *)oc_el->values[oc_el->num_values-1].data);
+       ret = dsdb_module_check_access_on_dn(module, req, parent, SEC_ADS_CREATE_CHILD, guid);
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
+       return ldb_next_request(module, req);
+}
 
-static int make_req_access_check(struct ldb_module *module, struct ldb_request *req,
-                                struct acl_context *ac, const char *filter)
+/* checks for validated writes */
+static int acl_check_extended_right(TALLOC_CTX *mem_ctx,
+                                   struct security_descriptor *sd,
+                                   struct security_token *token,
+                                   const char *ext_right,
+                                   uint32_t right_type,
+                                   struct dom_sid *sid)
 {
-       struct ldb_context *ldb;
-       int ret;
-       const char **attrs = talloc_array(ac, const char *, 3);
-       struct ldb_parse_tree *tree = ldb_parse_tree(req, filter);
+       struct GUID right;
+       NTSTATUS status;
+       uint32_t access_granted;
+       struct object_tree *root = NULL;
+       struct object_tree *new_node = NULL;
+       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
 
-       attrs[0] = talloc_strdup(attrs, "ntSecurityDescriptor");
-       attrs[1] = talloc_strdup(attrs, "objectClass");
-       attrs[2] = NULL;
+       GUID_from_string(ext_right, &right);
 
-       ldb = ldb_module_get_ctx(module);
-       ret = ldb_build_search_req_ex(&ac->down_req,
-                                     ldb, ac,
-                                     ac->dn_to_check,
-                                     LDB_SCOPE_SUBTREE,
-                                     tree,
-                                     attrs,
-                                     NULL,
-                                     ac, acl_visible_callback,
-                                     req);
-       return ret;
+       if (!insert_in_object_tree(tmp_ctx, &right, right_type,
+                                  &root, &new_node)) {
+               DEBUG(10, ("acl_ext_right: cannot add to object tree\n"));
+               talloc_free(tmp_ctx);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+       status = sec_access_check_ds(sd, token,
+                                    right_type,
+                                    &access_granted,
+                                    root,
+                                    sid);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(tmp_ctx);
+               return LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
+       }
+       talloc_free(tmp_ctx);
+       return LDB_SUCCESS;
 }
 
-static const char *user_name(TALLOC_CTX *mem_ctx, struct ldb_module *module)
+
+/* ckecks if modifications are allowed on "Member" attribute */
+static int acl_check_self_membership(TALLOC_CTX *mem_ctx,
+                                    struct ldb_module *module,
+                                    struct ldb_request *req,
+                                    struct security_descriptor *sd,
+                                    struct dom_sid *sid,
+                                    const struct GUID *oc_guid,
+                                    const struct dsdb_attribute *attr)
 {
+       int ret;
+       unsigned int i;
        struct ldb_context *ldb = ldb_module_get_ctx(module);
-       struct auth_session_info *session_info
-               = (struct auth_session_info *)ldb_get_opaque(ldb, "sessionInfo");
-       if (!session_info) {
-               return "UNKNOWN (NULL)";
+       struct ldb_dn *user_dn;
+       struct ldb_message_element *member_el;
+       /* if we have wp, we can do whatever we like */
+       if (acl_check_access_on_attribute(module,
+                                         mem_ctx,
+                                         sd,
+                                         sid,
+                                         SEC_ADS_WRITE_PROP,
+                                         attr) == LDB_SUCCESS) {
+               return LDB_SUCCESS;
        }
-
-       return talloc_asprintf(mem_ctx, "%s\\%s",
-                              session_info->server_info->domain_name,
-                              session_info->server_info->account_name);
+       /* if we are adding/deleting ourselves, check for self membership */
+       ret = dsdb_find_dn_by_sid(ldb, mem_ctx, acl_user_token(module)->user_sid, &user_dn);
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
+       member_el = ldb_msg_find_element(req->op.mod.message, "member");
+       if (!member_el) {
+               return ldb_operr(ldb);
+       }
+       /* user can only remove oneself */
+       if (member_el->num_values == 0) {
+               return LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
+       }
+       for (i = 0; i < member_el->num_values; i++) {
+               if (strcasecmp((const char *)member_el->values[i].data,
+                              ldb_dn_get_extended_linearized(mem_ctx, user_dn, 1)) != 0) {
+                       return LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
+               }
+       }
+       ret = acl_check_extended_right(mem_ctx, sd, acl_user_token(module),
+                                      GUID_DRS_SELF_MEMBERSHIP,
+                                      SEC_ADS_SELF_WRITE,
+                                      sid);
+       if (ret == LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS) {
+               dsdb_acl_debug(sd, acl_user_token(module),
+                              req->op.mod.message->dn,
+                              true,
+                              10);
+       }
+       return ret;
 }
 
-static int acl_module_init(struct ldb_module *module)
+static int acl_check_password_rights(TALLOC_CTX *mem_ctx,
+                                    struct ldb_module *module,
+                                    struct ldb_request *req,
+                                    struct security_descriptor *sd,
+                                    struct dom_sid *sid,
+                                    const struct GUID *oc_guid)
 {
-       struct ldb_context *ldb;
-       struct acl_private *data;
-       int ret;
-
-       ldb = ldb_module_get_ctx(module);
-
-       ret = ldb_mod_register_control(module, LDB_CONTROL_SD_FLAGS_OID);
+       int ret = LDB_SUCCESS;
+       unsigned int del_attr_cnt = 0, add_attr_cnt = 0, rep_attr_cnt = 0;
+       struct ldb_message_element *el;
+       struct ldb_message *msg;
+       const char *passwordAttrs[] = { "userPassword", "unicodePwd",
+                                       "clearTextPassword", NULL }, **l;
+       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+
+       msg = ldb_msg_copy_shallow(tmp_ctx, req->op.mod.message);
+       if (msg == NULL) {
+               return ldb_module_oom(module);
+       }
+       for (l = passwordAttrs; *l != NULL; l++) {
+               while ((el = ldb_msg_find_element(msg, *l)) != NULL) {
+                       if (el->flags == LDB_FLAG_MOD_DELETE) {
+                               ++del_attr_cnt;
+                       }
+                       if (el->flags == LDB_FLAG_MOD_ADD) {
+                               ++add_attr_cnt;
+                       }
+                       if (el->flags == LDB_FLAG_MOD_REPLACE) {
+                               ++rep_attr_cnt;
+                       }
+                       ldb_msg_remove_element(msg, el);
+               }
+       }
+       /* a single delete will be handled by password hash
+          later in the stack, so we let it though here */
+       if (del_attr_cnt > 0 && add_attr_cnt == 0) {
+               talloc_free(tmp_ctx);
+               return LDB_SUCCESS;
+       }
+       if (rep_attr_cnt > 0 || (add_attr_cnt != del_attr_cnt)) {
+               ret = acl_check_extended_right(tmp_ctx, sd, acl_user_token(module),
+                                              GUID_DRS_FORCE_CHANGE_PASSWORD,
+                                              SEC_ADS_CONTROL_ACCESS,
+                                              sid);
+       }
+       else if (add_attr_cnt == 1 && del_attr_cnt == 1) {
+               ret = acl_check_extended_right(tmp_ctx, sd, acl_user_token(module),
+                                              GUID_DRS_USER_CHANGE_PASSWORD,
+                                              SEC_ADS_CONTROL_ACCESS,
+                                              sid);
+               /* Very strange, but we get constraint violation in this case */
+               if (ret == LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS) {
+                       ret = LDB_ERR_CONSTRAINT_VIOLATION;
+               }
+       }
        if (ret != LDB_SUCCESS) {
-               ldb_debug(ldb, LDB_DEBUG_ERROR,
-                         "acl_module_init: Unable to register control with rootdse!\n");
-               return LDB_ERR_OPERATIONS_ERROR;
+               dsdb_acl_debug(sd, acl_user_token(module),
+                              req->op.mod.message->dn,
+                              true,
+                              10);
        }
-
-       data = talloc(module, struct acl_private);
-       data->perform_check = lp_parm_bool(ldb_get_opaque(ldb, "loadparm"),
-                                 NULL, "acl", "perform", false);
-       ldb_module_set_private(module, data);
-
-       return ldb_next_init(module);
+       talloc_free(tmp_ctx);
+       return ret;
 }
 
-static int acl_add(struct ldb_module *module, struct ldb_request *req)
+static int acl_modify(struct ldb_module *module, struct ldb_request *req)
 {
        int ret;
-       struct acl_context *ac;
-       struct ldb_dn * parent = ldb_dn_get_parent(req, req->op.add.message->dn);
-       char * filter;
-       struct ldb_context *ldb;
-       struct acl_private *data;
-
-       ldb = ldb_module_get_ctx(module);
-       data = talloc_get_type(ldb_module_get_private(module), struct acl_private);
+       struct ldb_context *ldb = ldb_module_get_ctx(module);
+       const struct dsdb_schema *schema;
+       unsigned int i;
+       const struct GUID *guid;
+       uint32_t access_granted;
+       struct object_tree *root = NULL;
+       struct object_tree *new_node = NULL;
+       NTSTATUS status;
+       struct ldb_result *acl_res;
+       struct security_descriptor *sd;
+       struct dom_sid *sid = NULL;
+       struct ldb_control *as_system = ldb_request_get_control(req, LDB_CONTROL_AS_SYSTEM_OID);
+       TALLOC_CTX *tmp_ctx = talloc_new(req);
+       static const char *acl_attrs[] = {
+               "nTSecurityDescriptor",
+               "objectClass",
+               "objectSid",
+               NULL
+       };
+
+       if (as_system != NULL) {
+               as_system->critical = 0;
+       }
 
-       if (!data->perform_check)
+       /* Don't print this debug statement if elements[0].name is going to be NULL */
+       if(req->op.mod.message->num_elements > 0)
+       {
+               DEBUG(10, ("ldb:acl_modify: %s\n", req->op.mod.message->elements[0].name));
+       }
+       if (dsdb_module_am_system(module) || as_system) {
                return ldb_next_request(module, req);
-
-       ac = talloc(req, struct acl_context);
-       if (ac == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
        }
-
-       if (what_is_user(module) == SECURITY_SYSTEM)
+       if (ldb_dn_is_special(req->op.mod.message->dn)) {
                return ldb_next_request(module, req);
+       }
+       ret = dsdb_module_search_dn(module, tmp_ctx, &acl_res, req->op.mod.message->dn,
+                                   acl_attrs,
+                                   DSDB_FLAG_NEXT_MODULE);
 
-       ac->module = module;
-       ac->req = req;
-       ac->ignore_security = true;
-       ac->dn_to_check = ldb_dn_get_parent(req, parent);
-       ac->token = user_token(module);
-       ac->user_type = what_is_user(module);
-       ac->sec_result = LDB_SUCCESS;
-       if (!is_root_base_dn(ldb, req->op.add.message->dn) && parent && !is_root_base_dn(ldb, parent)){
-               filter = talloc_asprintf(req,"(&(objectClass=*)(|(%s=%s)(%s=%s))))",
-                                        ldb_dn_get_component_name(parent,0),
-                                        ldb_dn_get_component_val(parent,0)->data,
-                                        ldb_dn_get_component_name(ac->dn_to_check,0),
-                                        ldb_dn_get_component_val(ac->dn_to_check,0)->data);
-
-               ret = make_req_access_check(module, req, ac, filter);
-               if (ret != LDB_SUCCESS){
-                       return ret;
-               }
-               return ldb_next_request(module, ac->down_req);
+       if (ret != LDB_SUCCESS) {
+               goto fail;
        }
-       return ldb_next_request(module, req);
-}
 
-static int acl_modify(struct ldb_module *module, struct ldb_request *req)
-{
-       int ret;
-       struct acl_context *ac;
-       struct ldb_dn * parent = ldb_dn_get_parent(req, req->op.mod.message->dn);
-       char * filter;
-       struct ldb_context *ldb;
-       struct acl_private *data;
+       schema = dsdb_get_schema(ldb, tmp_ctx);
+       if (!schema) {
+               ret = LDB_ERR_OPERATIONS_ERROR;
+               goto fail;
+       }
 
-       ldb = ldb_module_get_ctx(module);
-       data = talloc_get_type(ldb_module_get_private(module), struct acl_private);
+       ret = dsdb_get_sd_from_ldb_message(ldb, tmp_ctx, acl_res->msgs[0], &sd);
+       if (ret != LDB_SUCCESS) {
+               DEBUG(10, ("acl_modify: cannot get descriptor\n"));
+               goto fail;
+       }
+       /* Theoretically we pass the check if the object has no sd */
+       if (!sd) {
+               goto success;
+       }
 
-       if (!data->perform_check)
-               return ldb_next_request(module, req);
+       guid = get_oc_guid_from_message(module, schema, acl_res->msgs[0]);
+       if (!guid) {
+               DEBUG(10, ("acl_modify: cannot get guid\n"));
+               goto fail;
+       }
+       sid = samdb_result_dom_sid(req, acl_res->msgs[0], "objectSid");
+       if (!insert_in_object_tree(tmp_ctx, guid, SEC_ADS_WRITE_PROP,
+                                  &root, &new_node)) {
+               DEBUG(10, ("acl_modify: cannot add to object tree\n"));
+               goto fail;
+       }
+       for (i=0; i < req->op.mod.message->num_elements; i++){
+               const struct dsdb_attribute *attr;
+               attr = dsdb_attribute_by_lDAPDisplayName(schema,
+                                                                req->op.mod.message->elements[i].name);
+
+               if (ldb_attr_cmp("nTSecurityDescriptor", req->op.mod.message->elements[i].name) == 0) {
+                       status = sec_access_check_ds(sd, acl_user_token(module),
+                                            SEC_STD_WRITE_DAC,
+                                            &access_granted,
+                                            NULL,
+                                            sid);
+
+                       if (!NT_STATUS_IS_OK(status)) {
+                               DEBUG(10, ("Object %s has no write dacl access\n",
+                                          ldb_dn_get_linearized(req->op.mod.message->dn)));
+                               dsdb_acl_debug(sd,
+                                              acl_user_token(module),
+                                              req->op.mod.message->dn,
+                                              true,
+                                              10);
+                               ret = LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
+                               goto fail;
+                       }
+               }
+               else if (ldb_attr_cmp("member", req->op.mod.message->elements[i].name) == 0) {
+                       ret = acl_check_self_membership(tmp_ctx,
+                                                       module,
+                                                       req,
+                                                       sd,
+                                                       sid,
+                                                       guid,
+                                                       attr);
+                       if (ret != LDB_SUCCESS) {
+                               goto fail;
+                       }
+               }
+               else if (ldb_attr_cmp("dBCSPwd", req->op.mod.message->elements[i].name) == 0) {
+                       /* this one is not affected by any rights, we should let it through
+                          so that passwords_hash returns the correct error */
+                       continue;
+               }
+               else if (ldb_attr_cmp("unicodePwd", req->op.mod.message->elements[i].name) == 0 ||
+                        ldb_attr_cmp("userPassword", req->op.mod.message->elements[i].name) == 0 ||
+                        ldb_attr_cmp("clearTextPassword", req->op.mod.message->elements[i].name) == 0) {
+                       ret = acl_check_password_rights(tmp_ctx,
+                                                       module,
+                                                       req,
+                                                       sd,
+                                                       sid,
+                                                       guid);
+                       if (ret != LDB_SUCCESS) {
+                               goto fail;
+                       }
+               } else {
 
-       ac = talloc(req, struct acl_context);
-       if (ac == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
+               /* This basic attribute existence check with the right errorcode
+                * is needed since this module is the first one which requests
+                * schema attribute informations.
+                * The complete attribute checking is done in the
+                * "objectclass_attrs" module behind this one.
+                */
+                       if (!attr) {
+                               ldb_asprintf_errstring(ldb, "acl_modify: attribute '%s' on entry '%s' was not found in the schema!",
+                                                      req->op.mod.message->elements[i].name,
+                                              ldb_dn_get_linearized(req->op.mod.message->dn));
+                               ret =  LDB_ERR_NO_SUCH_ATTRIBUTE;
+                               goto fail;
+                       }
+                       if (!insert_in_object_tree(tmp_ctx,
+                                                  &attr->attributeSecurityGUID, SEC_ADS_WRITE_PROP,
+                                                  &new_node, &new_node)) {
+                               DEBUG(10, ("acl_modify: cannot add to object tree securityGUID\n"));
+                               ret = LDB_ERR_OPERATIONS_ERROR;
+                               goto fail;
+                       }
+
+                       if (!insert_in_object_tree(tmp_ctx,
+                                                  &attr->schemaIDGUID, SEC_ADS_WRITE_PROP, &new_node, &new_node)) {
+                               DEBUG(10, ("acl_modify: cannot add to object tree attributeGUID\n"));
+                               ret = LDB_ERR_OPERATIONS_ERROR;
+                               goto fail;
+                       }
+               }
        }
 
-/* TODO Is this really right? */
-/*     if (what_is_user(module) == SECURITY_SYSTEM) */
-               return ldb_next_request(module, req);
+       if (root->num_of_children > 0) {
+               status = sec_access_check_ds(sd, acl_user_token(module),
+                                            SEC_ADS_WRITE_PROP,
+                                            &access_granted,
+                                            root,
+                                            sid);
 
-       ac->module = module;
-       ac->req = req;
-       ac->ignore_security = true;
-       ac->dn_to_check = req->op.mod.message->dn;
-       ac->token = user_token(module);
-       ac->user_type = what_is_user(module);
-       ac->sec_result = LDB_SUCCESS;
-       if (!is_root_base_dn(ldb, req->op.mod.message->dn) && parent && !is_root_base_dn(ldb, parent)){
-               filter = talloc_asprintf(req,"(&(objectClass=*)(|(%s=%s)(%s=%s))))",
-                                  ldb_dn_get_component_name(parent,0),
-                                  ldb_dn_get_component_val(parent,0)->data,
-                                  ldb_dn_get_component_name(req->op.mod.message->dn,0),
-                                  ldb_dn_get_component_val(req->op.mod.message->dn,0)->data);
-
-               ret = make_req_access_check(module, req, ac, filter);
-               if (ret != LDB_SUCCESS){
-                       return ret;
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(10, ("Object %s has no write property access\n",
+                                  ldb_dn_get_linearized(req->op.mod.message->dn)));
+                       dsdb_acl_debug(sd,
+                                 acl_user_token(module),
+                                 req->op.mod.message->dn,
+                                 true,
+                                 10);
+                       ret = LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
+                       goto fail;
                }
-               return ldb_next_request(module, ac->down_req);
        }
+
+success:
+       talloc_free(tmp_ctx);
        return ldb_next_request(module, req);
+fail:
+       talloc_free(tmp_ctx);
+       return ret;
 }
 
 /* similar to the modify for the time being.
@@ -834,310 +1005,345 @@ static int acl_modify(struct ldb_module *module, struct ldb_request *req)
 static int acl_delete(struct ldb_module *module, struct ldb_request *req)
 {
        int ret;
-       struct acl_context *ac;
-       struct ldb_dn * parent = ldb_dn_get_parent(req, req->op.del.dn);
-       char * filter;
+       struct ldb_dn *parent = ldb_dn_get_parent(req, req->op.del.dn);
        struct ldb_context *ldb;
-       struct acl_private *data;
+       struct ldb_control *as_system = ldb_request_get_control(req, LDB_CONTROL_AS_SYSTEM_OID);
 
-       ldb = ldb_module_get_ctx(module);
-       data = talloc_get_type(ldb_module_get_private(module), struct acl_private);
+       if (as_system != NULL) {
+               as_system->critical = 0;
+       }
 
-       if (!data->perform_check)
+       DEBUG(10, ("ldb:acl_delete: %s\n", ldb_dn_get_linearized(req->op.del.dn)));
+       if (dsdb_module_am_system(module) || as_system) {
                return ldb_next_request(module, req);
-
-       ac = talloc(req, struct acl_context);
-       if (ac == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       if (ac->user_type == SECURITY_SYSTEM)
+       if (ldb_dn_is_special(req->op.del.dn)) {
+               return ldb_next_request(module, req);
+       }
+       ldb = ldb_module_get_ctx(module);
+       /* first check if we have delete object right */
+       ret = dsdb_module_check_access_on_dn(module, req, req->op.del.dn, SEC_STD_DELETE, NULL);
+       if (ret == LDB_SUCCESS) {
                return ldb_next_request(module, req);
+       }
 
-       ac->module = module;
-       ac->req = req;
-       ac->ignore_security = true;
-       ac->dn_to_check = req->op.del.dn;
-       ac->token = user_token(module);
-       ac->user_type = what_is_user(module);
-       ac->sec_result = LDB_SUCCESS;
-       if (parent) {
-               filter = talloc_asprintf(req,"(&(objectClass=*)(|(%s=%s)(%s=%s))))",
-                                        ldb_dn_get_component_name(parent,0),
-                                        ldb_dn_get_component_val(parent,0)->data,
-                                        ldb_dn_get_component_name(req->op.del.dn,0),
-                                        ldb_dn_get_component_val(req->op.del.dn,0)->data);
-               ret = make_req_access_check(module, req, ac, filter);
-
-               if (ret != LDB_SUCCESS){
-                       return ret;
-                }
-               return ldb_next_request(module, ac->down_req);
+       /* Nope, we don't have delete object. Lets check if we have delete child on the parent */
+       /* No parent, so check fails */
+       /* FIXME: this has to be made dynamic at some point */
+       if ((ldb_dn_compare(req->op.del.dn, (ldb_get_schema_basedn(ldb))) == 0) ||
+           (ldb_dn_compare(req->op.del.dn, (ldb_get_config_basedn(ldb))) == 0) ||
+           (ldb_dn_compare(req->op.del.dn, (ldb_get_default_basedn(ldb))) == 0) ||
+           (ldb_dn_compare(req->op.del.dn, (ldb_get_root_basedn(ldb))) == 0)) {
+               DEBUG(10,("acl:deleting an NC\n"));
+               return ldb_module_done(req, NULL, NULL, LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS);
        }
 
+       ret = dsdb_module_check_access_on_dn(module, req, parent, SEC_ADS_DELETE_CHILD, NULL);
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
        return ldb_next_request(module, req);
 }
 
 static int acl_rename(struct ldb_module *module, struct ldb_request *req)
 {
-       struct ldb_dn *source_parent;
-       struct ldb_dn *dest_parent;
        int ret;
-       struct acl_context *ac;
-       char * filter;
+       struct ldb_dn *oldparent = ldb_dn_get_parent(req, req->op.rename.olddn);
+       struct ldb_dn *newparent = ldb_dn_get_parent(req, req->op.rename.newdn);
+       const struct dsdb_schema *schema;
        struct ldb_context *ldb;
-       struct acl_private *data;
+       struct security_descriptor *sd = NULL;
+       struct dom_sid *sid = NULL;
+       struct ldb_result *acl_res;
+       const struct GUID *guid;
+       struct object_tree *root = NULL;
+       struct object_tree *new_node = NULL;
+       struct ldb_control *as_system = ldb_request_get_control(req, LDB_CONTROL_AS_SYSTEM_OID);
+       TALLOC_CTX *tmp_ctx = talloc_new(req);
+       NTSTATUS status;
+       uint32_t access_granted;
+       const char *rdn_name;
+       static const char *acl_attrs[] = {
+               "nTSecurityDescriptor",
+               "objectClass",
+               "objectSid",
+               NULL
+       };
+
+       if (as_system != NULL) {
+               as_system->critical = 0;
+       }
 
+       DEBUG(10, ("ldb:acl_rename: %s\n", ldb_dn_get_linearized(req->op.rename.olddn)));
+       if (dsdb_module_am_system(module) || as_system) {
+               return ldb_next_request(module, req);
+       }
+       if (ldb_dn_is_special(req->op.rename.olddn)) {
+               return ldb_next_request(module, req);
+       }
        ldb = ldb_module_get_ctx(module);
-       data = talloc_get_type(ldb_module_get_private(module), struct acl_private);
 
-       if (!data->perform_check)
-               return ldb_next_request(module, req);
+       ret = dsdb_module_search_dn(module, req, &acl_res, req->op.rename.olddn,
+                                   acl_attrs,
+                                   DSDB_FLAG_NEXT_MODULE |
+                                   DSDB_SEARCH_SHOW_DELETED);
+       /* we sould be able to find the parent */
+       if (ret != LDB_SUCCESS) {
+               DEBUG(10,("acl: failed to find object %s\n",
+                         ldb_dn_get_linearized(req->op.rename.olddn)));
+               return ret;
+       }
 
-       ac = talloc(req, struct acl_context);
-       if (ac == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
+       schema = dsdb_get_schema(ldb, acl_res);
+       if (!schema) {
+               talloc_free(acl_res);
+               return ldb_operr(ldb);
+       }
+
+       guid = get_oc_guid_from_message(module, schema, acl_res->msgs[0]);
+       if (!insert_in_object_tree(tmp_ctx, guid, SEC_ADS_WRITE_PROP,
+                                  &root, &new_node)) {
+               return ldb_operr(ldb);
+       };
+
+       guid = attribute_schemaid_guid_by_lDAPDisplayName(schema,
+                                                         "name");
+       if (!insert_in_object_tree(tmp_ctx, guid, SEC_ADS_WRITE_PROP,
+                                  &new_node, &new_node)) {
+               return ldb_operr(ldb);
+       };
+
+       rdn_name = ldb_dn_get_rdn_name(req->op.rename.olddn);
+       if (rdn_name == NULL) {
+               return ldb_operr(ldb);
+       }
+       guid = attribute_schemaid_guid_by_lDAPDisplayName(schema,
+                                                         rdn_name);
+       if (!insert_in_object_tree(tmp_ctx, guid, SEC_ADS_WRITE_PROP,
+                                  &new_node, &new_node)) {
+               return ldb_operr(ldb);
+       };
+
+       ret = dsdb_get_sd_from_ldb_message(ldb, req, acl_res->msgs[0], &sd);
+
+       if (ret != LDB_SUCCESS) {
+               return ldb_operr(ldb);
+       }
+       /* Theoretically we pass the check if the object has no sd */
+       if (!sd) {
+               return LDB_SUCCESS;
+       }
+       sid = samdb_result_dom_sid(req, acl_res->msgs[0], "objectSid");
+       status = sec_access_check_ds(sd, acl_user_token(module),
+                                    SEC_ADS_WRITE_PROP,
+                                    &access_granted,
+                                    root,
+                                    sid);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("Object %s has no wp on name\n",
+                          ldb_dn_get_linearized(req->op.rename.olddn)));
+               dsdb_acl_debug(sd,
+                         acl_user_token(module),
+                         req->op.rename.olddn,
+                         true,
+                         10);
+               return LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
        }
 
-       if (ac->user_type == SECURITY_SYSTEM)
+       if (ldb_dn_compare(oldparent, newparent) == 0) {
+               /* regular rename, not move, nothing more to do */
                return ldb_next_request(module, req);
+       }
 
-       ac->module = module;
-       ac->req = req;
-       ac->ignore_security = true;
-       ac->token = user_token(module);
-       ac->user_type = what_is_user(module);
-       ac->sec_result = LDB_SUCCESS;
-
-       /* We need to know if it is a simple rename or a move operation */
-       source_parent = ldb_dn_get_parent(req, req->op.rename.olddn);
-       dest_parent = ldb_dn_get_parent(req, req->op.rename.newdn);
-
-       if (ldb_dn_compare(source_parent, dest_parent) == 0){
-               /*Not a move, just rename*/
-               filter = talloc_asprintf(req,"(&(objectClass=*)(|(%s=%s)(%s=%s))))",
-                                        ldb_dn_get_component_name(dest_parent,0),
-                                        ldb_dn_get_component_val(dest_parent,0)->data,
-                                        ldb_dn_get_component_name(req->op.rename.olddn,0),
-                                        ldb_dn_get_component_val(req->op.rename.olddn,0)->data);
-       }
-       else{
-               filter = talloc_asprintf(req,"(&(objectClass=*)(|(%s=%s)(%s=%s))))",
-                                        ldb_dn_get_component_name(dest_parent,0),
-                                        ldb_dn_get_component_val(dest_parent,0)->data,
-                                        ldb_dn_get_component_name(source_parent,0),
-                                        ldb_dn_get_component_val(source_parent,0)->data);
-       }
-
-       ret = make_req_access_check(module, req, ac, filter);
-
-       if (ret != LDB_SUCCESS){
+       /* What exactly to do in this case? It would fail anyway.. */
+       /* FIXME: this has to be made dynamic at some point */
+       if ((ldb_dn_compare(req->op.rename.newdn, (ldb_get_schema_basedn(ldb))) == 0) ||
+           (ldb_dn_compare(req->op.rename.newdn, (ldb_get_config_basedn(ldb))) == 0) ||
+           (ldb_dn_compare(req->op.rename.newdn, (ldb_get_default_basedn(ldb))) == 0) ||
+           (ldb_dn_compare(req->op.rename.newdn, (ldb_get_root_basedn(ldb))) == 0)) {
+               DEBUG(10,("acl:moving as an NC\n"));
+               return LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
+       }
+       /* new parent should have create child */
+       talloc_free(tmp_ctx);
+       tmp_ctx = talloc_new(req);
+       root = NULL;
+       new_node = NULL;
+       guid = get_oc_guid_from_message(module, schema, acl_res->msgs[0]);
+       if (!guid) {
+               DEBUG(10,("acl:renamed object has no object class\n"));
+               return ldb_module_done(req, NULL, NULL,  LDB_ERR_OPERATIONS_ERROR);
+       }
+
+       ret = dsdb_module_check_access_on_dn(module, req, newparent, SEC_ADS_CREATE_CHILD, guid);
+       if (ret != LDB_SUCCESS) {
+               DEBUG(10,("acl:access_denied renaming %s", ldb_dn_get_linearized(req->op.rename.olddn)));
                return ret;
-               }
-       return ldb_next_request(module, ac->down_req);
+       }
+       /* do we have delete object on the object? */
+
+       status = sec_access_check_ds(sd, acl_user_token(module),
+                                    SEC_STD_DELETE,
+                                    &access_granted,
+                                    NULL,
+                                    sid);
+
+       if (NT_STATUS_IS_OK(status)) {
+               return ldb_next_request(module, req);
+       }
+       /* what about delete child on the current parent */
+       ret = dsdb_module_check_access_on_dn(module, req, oldparent, SEC_ADS_DELETE_CHILD, NULL);
+       if (ret != LDB_SUCCESS) {
+               DEBUG(10,("acl:access_denied renaming %s", ldb_dn_get_linearized(req->op.rename.olddn)));
+               return ldb_module_done(req, NULL, NULL, ret);
+       }
+       return ldb_next_request(module, req);
 }
 
 static int acl_search_callback(struct ldb_request *req, struct ldb_reply *ares)
 {
        struct ldb_context *ldb;
        struct acl_context *ac;
-       struct security_descriptor *sd;
-       uint32_t searchFlags;
-       uint32_t access_mask;
-       struct object_tree *ot;
-       int i, ret;
-       NTSTATUS status;
-       struct ldb_message_element *element_security_descriptor;
-       struct ldb_message_element *element_object_class;
-       const struct dsdb_attribute *attr;
-       const struct dsdb_schema *schema;
-       struct GUID *oc_guid;
+       struct acl_private *data;
+       struct ldb_result *acl_res;
+       static const char *acl_attrs[] = {
+               "objectClass",
+               "nTSecurityDescriptor",
+               "objectSid",
+               NULL
+       };
+       int ret, i;
 
        ac = talloc_get_type(req->context, struct acl_context);
+       data = talloc_get_type(ldb_module_get_private(ac->module), struct acl_private);
        ldb = ldb_module_get_ctx(ac->module);
-       schema = dsdb_get_schema(ldb);
+
        if (!ares) {
-               return ldb_module_done(ac->req, NULL, NULL, LDB_ERR_OPERATIONS_ERROR);
+               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);
+               return ldb_module_done(ac->req, ares->controls,
+                                      ares->response, ares->error);
        }
 
        switch (ares->type) {
        case LDB_REPLY_ENTRY:
-               switch (ac->user_type) {
-               case SECURITY_SYSTEM:
-               case SECURITY_ANONYMOUS:/*FIXME: should we let anonymous have system access*/
-                       break;
-               default:
-                       /* Access checks
-                        *
-                        * 0. If we do not have nTSecurityDescriptor, we do not have an object in the response,
-                        *    so check the parent dn.
-                        * 1. Call sec_access_check on empty tree
-                        * 2. For each attribute call extended_access_check
-                        * 3. For each attribute call build_object_tree_form_attr_list and then check with sec_access_check
-                        *
-                        */
-                       element_security_descriptor = ldb_msg_find_element(ares->message, "nTSecurityDescriptor");
-                       element_object_class = ldb_msg_find_element(ares->message, "objectClass");
-                       if (!element_security_descriptor || !element_object_class)
-                               break;
-
-                       sd = talloc(ldb, struct security_descriptor);
-                       if(!sd) {
-                         return ldb_module_done(ac->req, NULL, NULL, LDB_ERR_OPERATIONS_ERROR);
+               if (ac->allowedAttributes 
+                   || ac->allowedChildClasses
+                   || ac->allowedChildClassesEffective
+                   || ac->allowedAttributesEffective
+                   || ac->sDRightsEffective) {
+                       ret = dsdb_module_search_dn(ac->module, ac, &acl_res, ares->message->dn, 
+                                                   acl_attrs,
+                                                   DSDB_FLAG_NEXT_MODULE);
+                       if (ret != LDB_SUCCESS) {
+                               return ldb_module_done(ac->req, NULL, NULL, ret);
                        }
-                       if(!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_struct_blob(&element_security_descriptor->values[0],
-                                                                        ldb,
-                                                                        NULL,
-                                                                        sd,
-                                                                        (ndr_pull_flags_fn_t)ndr_pull_security_descriptor))) {
-                               DEBUG(0, ("acl_search_callback: Error parsing security descriptor\n"));
-                               return ldb_module_done(ac->req, NULL, NULL, LDB_ERR_OPERATIONS_ERROR);
+                       if (ac->allowedAttributes || ac->allowedAttributesEffective) {
+                               ret = acl_allowedAttributes(ac->module, ac->schema, acl_res->msgs[0], ares->message, ac);
+                               if (ret != LDB_SUCCESS) {
+                                       return ldb_module_done(ac->req, NULL, NULL, ret);
+                               }
                        }
-
-                       oc_guid = class_schemaid_guid_by_lDAPDisplayName(schema, element_object_class->values[0].data);
-                       for (i=0; i<ares->message->num_elements; i++) {
-                               attr = dsdb_attribute_by_lDAPDisplayName(schema, ares->message->elements[i].name);
-                               if (attr) {
-                                       searchFlags = attr->searchFlags;
-                               } else {
-                                       searchFlags = 0x0;
+                       if (ac->allowedChildClasses) {
+                               ret = acl_childClasses(ac->module, ac->schema, acl_res->msgs[0],
+                                                      ares->message, "allowedChildClasses");
+                               if (ret != LDB_SUCCESS) {
+                                       return ldb_module_done(ac->req, NULL, NULL, ret);
                                }
-
-                               /*status = extended_access_check(ares->message->elements[i].name, access_mask, searchFlags); */ /* Todo FIXME */
-                               ac->access_needed = SEC_ADS_READ_PROP;
-                               if (NT_STATUS_IS_OK(status)) {
-                                       ot = insert_in_object_tree(req, oc_guid, NULL, ac->access_needed, NULL);
-
-                                       insert_in_object_tree(req,
-                                                             &attr->schemaIDGUID,
-                                                             &attr->attributeSecurityGUID,
-                                                             ac->access_needed,
-                                                             ot);
-
-                                       status = sec_access_check_ds(sd,
-                                                                    ac->token,
-                                                                    ac->access_needed,
-                                                                    &access_mask,
-                                                                    ot);
-
-                                       if (NT_STATUS_IS_OK(status)) {
-                                               continue;
-                                       }
+                       }
+                       if (ac->allowedChildClassesEffective) {
+                               ret = acl_childClassesEffective(ac->module, ac->schema,
+                                                               acl_res->msgs[0], ares->message, ac);
+                               if (ret != LDB_SUCCESS) {
+                                       return ldb_module_done(ac->req, NULL, NULL, ret);
+                               }
+                       }
+                       if (ac->sDRightsEffective) {
+                               ret = acl_sDRightsEffective(ac->module, 
+                                                           acl_res->msgs[0], ares->message, ac);
+                               if (ret != LDB_SUCCESS) {
+                                       return ldb_module_done(ac->req, NULL, NULL, ret);
                                }
-                               ldb_msg_remove_attr(ares->message, ares->message->elements[i].name);
                        }
-                       break;
                }
-               if (ac->nTSecurityDescriptor) {
-                       ldb_msg_remove_attr(ares->message, "nTSecurityDescriptor");
-               } else if (ac->objectClass) {
-                       ldb_msg_remove_attr(ares->message, "objectClass");
+               if (data && data->password_attrs) {
+                       if (!ac->am_system) {
+                               for (i = 0; data->password_attrs[i]; i++) {
+                                       ldb_msg_remove_attr(ares->message, data->password_attrs[i]);
+                               }
+                       }
                }
-
                return ldb_module_send_entry(ac->req, ares->message, ares->controls);
+
        case LDB_REPLY_REFERRAL:
                return ldb_module_send_referral(ac->req, ares->referral);
 
        case LDB_REPLY_DONE:
-               return ldb_module_done(ac->req, ares->controls,ares->response, LDB_SUCCESS);
-       }
+               return ldb_module_done(ac->req, ares->controls,
+                                      ares->response, LDB_SUCCESS);
 
-        return LDB_SUCCESS;
+       }
+       return LDB_SUCCESS;
 }
 
 static int acl_search(struct ldb_module *module, struct ldb_request *req)
 {
-       int ret;
        struct ldb_context *ldb;
        struct acl_context *ac;
-       const char **attrs;
-       struct ldb_control *sd_control;
-       struct ldb_control **sd_saved_controls;
-       struct ldb_dn * parent;
+       struct ldb_request *down_req;
        struct acl_private *data;
+       int ret, i;
 
        ldb = ldb_module_get_ctx(module);
-       data = talloc_get_type(ldb_module_get_private(module), struct acl_private);
-
-       if (!data || !data->perform_check)
-               return ldb_next_request(module, req);
 
-       if (what_is_user(module) == SECURITY_SYSTEM)
-               return ldb_next_request(module, req);
-
-       ac = talloc_get_type(req->context, struct acl_context);
-       if ( ac == NULL ) {
-               ac = talloc(req, struct acl_context);
-               if (ac == NULL) {
-                       ldb_oom(ldb);
-                       return LDB_ERR_OPERATIONS_ERROR;
-               }
-               ac->module = module;
-               ac->req = req;
-               ac->ignore_security = false;
-               ac->user_type = what_is_user(module);
-               ac->token = user_token(module);
-               ac->dn_to_check = req->op.search.base;
-               ac->sec_result = LDB_SUCCESS;
-
-               attrs = talloc_array(ac, const char*, 2);
-               attrs[0] = talloc_strdup(attrs, "nTSecurityDescriptor");
-               attrs[1] = NULL;
-               parent = ldb_dn_get_parent(req, ac->dn_to_check);
-               if (!is_root_base_dn(ldb, req->op.search.base) && parent && !is_root_base_dn(ldb, parent)) {
-                       /*we have parent so check for visibility*/
-                       ret = ldb_build_search_req(&ac->down_req,
-                                                  ldb, ac,
-                                                  parent,
-                                                  LDB_SCOPE_BASE,
-                                                  "(objectClass=*)",
-                                                  attrs,
-                                                  req->controls,
-                                                  ac, acl_visible_callback,
-                                                  req);
-                       if (ret != LDB_SUCCESS) {
-                               return ret;
-                       }
-                       return ldb_next_request(module, ac->down_req);
-               } else {
-                       return acl_forward_search(ac);
-               }
+       ac = talloc_zero(req, struct acl_context);
+       if (ac == NULL) {
+               return ldb_oom(ldb);
        }
-
-       return ldb_next_request(module, req);
-}
-
-static int acl_extended(struct ldb_module *module, struct ldb_request *req)
-{
-       struct ldb_context *ldb = ldb_module_get_ctx(module);
-       enum security_user_level user_type;
-       struct acl_private *data;
-
        data = talloc_get_type(ldb_module_get_private(module), struct acl_private);
 
-       if (!data->perform_check)
-               return ldb_next_request(module, req);
-
-       /* allow everybody to read the sequence number */
-       if (strcmp(req->op.extended.oid, LDB_EXTENDED_SEQUENCE_NUMBER) == 0) {
-               return ldb_next_request(module, req);
+       ac->module = module;
+       ac->req = req;
+       ac->am_system = dsdb_module_am_system(module);
+       ac->allowedAttributes = ldb_attr_in_list(req->op.search.attrs, "allowedAttributes");
+       ac->allowedAttributesEffective = ldb_attr_in_list(req->op.search.attrs, "allowedAttributesEffective");
+       ac->allowedChildClasses = ldb_attr_in_list(req->op.search.attrs, "allowedChildClasses");
+       ac->allowedChildClassesEffective = ldb_attr_in_list(req->op.search.attrs, "allowedChildClassesEffective");
+       ac->sDRightsEffective = ldb_attr_in_list(req->op.search.attrs, "sDRightsEffective");
+       ac->schema = dsdb_get_schema(ldb, ac);
+
+       /* replace any attributes in the parse tree that are private,
+          so we don't allow a search for 'userPassword=penguin',
+          just as we would not allow that attribute to be returned */
+       if (ac->am_system) {
+               /* FIXME: We should copy the tree and keep the original unmodified. */
+               /* remove password attributes */
+               if (data && data->password_attrs) {
+                       for (i = 0; data->password_attrs[i]; i++) {
+                               ldb_parse_tree_attr_replace(req->op.search.tree,
+                                                           data->password_attrs[i],
+                                                           "kludgeACLredactedattribute");
+                       }
+               }
        }
-
-       user_type = what_is_user(module);
-       switch (user_type) {
-       case SECURITY_SYSTEM:
-       case SECURITY_ADMINISTRATOR:
-               return ldb_next_request(module, req);
-       default:
-               ldb_asprintf_errstring(ldb,
-                                      "acl_extended: attempted database modify not permitted."
-                                      "User %s is not SYSTEM or an Administrator",
-                                      user_name(req, module));
-               return LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS;
+       ret = ldb_build_search_req_ex(&down_req,
+                                     ldb, ac,
+                                     req->op.search.base,
+                                     req->op.search.scope,
+                                     req->op.search.tree,
+                                     req->op.search.attrs,
+                                     req->controls,
+                                     ac, acl_search_callback,
+                                     req);
+       if (ret != LDB_SUCCESS) {
+               return ret;
        }
+       /* perform the search */
+       return ldb_next_request(module, down_req);
 }
 
 _PUBLIC_ const struct ldb_module_ops ldb_acl_module_ops = {
@@ -1147,6 +1353,5 @@ _PUBLIC_ const struct ldb_module_ops ldb_acl_module_ops = {
        .modify            = acl_modify,
        .del               = acl_delete,
        .rename            = acl_rename,
-       .extended          = acl_extended,
        .init_context      = acl_module_init
 };