summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-09-21 00:03:42 +0200
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-09-21 00:03:42 +0200
commit257ea8f96f4bb56edacdeba37e5fc16bb6ac2bc3 (patch)
tree7130ff9e967ac35861742427b8120ee6025268d1 /source4
parentc1527612b95cb7bc5bee7ebc34ab87013ab88b8a (diff)
parentae56b0f2f96cea7a77b0a19c0d16d94ad971fb3f (diff)
downloadsamba-257ea8f96f4bb56edacdeba37e5fc16bb6ac2bc3.tar.gz
samba-257ea8f96f4bb56edacdeba37e5fc16bb6ac2bc3.tar.bz2
samba-257ea8f96f4bb56edacdeba37e5fc16bb6ac2bc3.zip
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/samdb/ldb_modules/descriptor.c29
1 files changed, 29 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index e74a93c279..7b5b700916 100644
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -42,6 +42,10 @@
#include "auth/auth.h"
#include "param/param.h"
+struct descriptor_data {
+ bool inherit;
+};
+
struct descriptor_context {
struct ldb_module *module;
struct ldb_request *req;
@@ -395,10 +399,15 @@ static int descriptor_add(struct ldb_module *module, struct ldb_request *req)
struct descriptor_context *ac;
struct ldb_dn *parent_dn;
int ret;
+ struct descriptor_data *data;
static const char * const descr_attrs[] = { "nTSecurityDescriptor", NULL };
+ 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)) {
@@ -452,11 +461,31 @@ static int descriptor_rename(struct ldb_module *module, struct ldb_request *req)
return ldb_next_request(module, req);
}
+static int descriptor_init(struct ldb_module *module)
+{
+ struct ldb_context *ldb;
+ struct descriptor_data *data;
+
+ ldb = ldb_module_get_ctx(module);
+ data = talloc(module, struct descriptor_data);
+ if (data == NULL) {
+ ldb_oom(ldb);
+ 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);
+}
+
+
_PUBLIC_ const struct ldb_module_ops ldb_descriptor_module_ops = {
.name = "descriptor",
.add = descriptor_add,
.modify = descriptor_modify,
.rename = descriptor_rename,
+ .init_context = descriptor_init
};