diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-12-11 02:01:12 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-12-11 09:05:09 +0100 |
| commit | 2cb4450b83bef7a6817b95228d55eca48b1f4ef0 (patch) | |
| tree | a9c13d7aca38fcdbe6e3903a28da71a996d0c5ee | |
| parent | 566aae7a0edadcca5869db07a8ce3471b25c3804 (diff) | |
| download | samba-2cb4450b83bef7a6817b95228d55eca48b1f4ef0.tar.gz | |
s4:dsdb/descriptor: pass object_list to create_security_descriptor()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit a97b5f219678e409a851d9caf8317a6ef130c12f)
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/descriptor.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c index 192c745e254..fb100f76283 100644 --- a/source4/dsdb/samdb/ldb_modules/descriptor.c +++ b/source4/dsdb/samdb/ldb_modules/descriptor.c @@ -249,9 +249,15 @@ static DATA_BLOB *get_new_descriptor(struct ldb_module *module, struct dom_sid *default_owner; struct dom_sid *default_group; struct security_descriptor *default_descriptor = NULL; + struct GUID *object_list = NULL; if (objectclass != NULL) { default_descriptor = get_sd_unpacked(module, mem_ctx, objectclass); + object_list = talloc_zero_array(mem_ctx, struct GUID, 2); + if (object_list == NULL) { + return NULL; + } + object_list[0] = objectclass->schemaIDGUID; } if (object) { @@ -370,8 +376,13 @@ static DATA_BLOB *get_new_descriptor(struct ldb_module *module, default_owner = get_default_ag(mem_ctx, dn, session_info->security_token, ldb); default_group = get_default_group(mem_ctx, ldb, default_owner); - new_sd = create_security_descriptor(mem_ctx, parent_descriptor, user_descriptor, true, - NULL, SEC_DACL_AUTO_INHERIT|SEC_SACL_AUTO_INHERIT, + new_sd = create_security_descriptor(mem_ctx, + parent_descriptor, + user_descriptor, + true, + object_list, + SEC_DACL_AUTO_INHERIT | + SEC_SACL_AUTO_INHERIT, session_info->security_token, default_owner, default_group, map_generic_rights_ds); |