fix acl...

diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 2a8f5b4d0c70c62643e9da068aeb34726d23dce6..cfef0c680f5188d4d2af68021225d5c0a3f13bc1 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -636,8 +636,9 @@ static int descriptor_modify(struct ldb_module *module, struct ldb_request *req)
                return ldb_next_request(module, req);
        }
        flags = DSDB_FLAG_NEXT_MODULE | DSDB_FLAG_AS_SYSTEM;
-       if (show_deleted_control) {
+       if (true || show_deleted_control) {
                flags |= DSDB_SEARCH_SHOW_DELETED;
+               flags |= DSDB_SEARCH_SHOW_RECYCLED;
        }
        ret = dsdb_module_search_dn(module, state, &current_res, dn,
                                    current_attrs,
@@ -662,8 +663,11 @@ static int descriptor_modify(struct ldb_module *module, struct ldb_request *req)
                ret = dsdb_module_search_dn(module, state, &parent_res,
                                            parent_dn,
                                            parent_attrs,
-                                           DSDB_FLAG_NEXT_MODULE |
-                                           DSDB_FLAG_AS_SYSTEM,
+                                           flags,
+                                           //DSDB_FLAG_NEXT_MODULE |
+                                           //DSDB_FLAG_AS_SYSTEM |
+                                           //DSDB_SEARCH_SHOW_DELETED |
+                                           //DSDB_SEARCH_SHOW_RECYCLED,
                                            req);
                if (ret != LDB_SUCCESS) {
                        ldb_debug(ldb, LDB_DEBUG_ERROR, "descriptor_modify: Could not find SD for %s\n",