From bc53052d38092d32f08fb794d7ea90f89367c229 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 21 Sep 2009 16:31:08 -0700 Subject: s4:dsdb Run the new 'descriptor' module by default. This code was derived from the objectclass module, and we need the new code in the default provision, or else no ACL is set on each object. Andrew Bartlett --- source4/dsdb/samdb/ldb_modules/descriptor.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c index 7b5b700916..b0a5467bb7 100644 --- a/source4/dsdb/samdb/ldb_modules/descriptor.c +++ b/source4/dsdb/samdb/ldb_modules/descriptor.c @@ -43,7 +43,6 @@ #include "param/param.h" struct descriptor_data { - bool inherit; }; struct descriptor_context { @@ -405,9 +404,6 @@ static int descriptor_add(struct ldb_module *module, struct ldb_request *req) data = talloc_get_type(ldb_module_get_private(module), struct descriptor_data); ldb = ldb_module_get_ctx(module); - if (!data->inherit) - return ldb_next_request(module, req); - ldb_debug(ldb, LDB_DEBUG_TRACE, "descriptor_add\n"); if (ldb_dn_is_special(req->op.add.message->dn)) { @@ -473,8 +469,6 @@ static int descriptor_init(struct ldb_module *module) return LDB_ERR_OPERATIONS_ERROR; } - data->inherit = lp_parm_bool(ldb_get_opaque(ldb, "loadparm"), - NULL, "acl", "inheritance", false); ldb_module_set_private(module, data); return ldb_next_init(module); } -- cgit