diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-01-02 14:53:02 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-01-21 16:12:45 +0100 |
| commit | 6d7e53aaac8c95f86e1eb8593880ae1c09d973d4 (patch) | |
| tree | f496b6f98dd1a1b0cd89d889695ea91e86ce33c2 /source4/dsdb/samdb | |
| parent | 097fae2d1d6ae04a7bfc795803f200b6f703a904 (diff) | |
| download | samba-6d7e53aaac8c95f86e1eb8593880ae1c09d973d4.tar.gz samba-6d7e53aaac8c95f86e1eb8593880ae1c09d973d4.tar.bz2 samba-6d7e53aaac8c95f86e1eb8593880ae1c09d973d4.zip | |
dsdb-acl: Use dsdb_get_structural_oc_from_msg() in acl_modify()
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/dsdb/samdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/acl.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/acl.c b/source4/dsdb/samdb/ldb_modules/acl.c index b8fab552e1..990089256a 100644 --- a/source4/dsdb/samdb/ldb_modules/acl.c +++ b/source4/dsdb/samdb/ldb_modules/acl.c @@ -991,7 +991,7 @@ static int acl_modify(struct ldb_module *module, struct ldb_request *req) struct ldb_context *ldb = ldb_module_get_ctx(module); const struct dsdb_schema *schema; unsigned int i; - const struct GUID *guid; + const struct dsdb_class *objectclass; uint32_t access_granted; NTSTATUS status; struct ldb_result *acl_res; @@ -1061,11 +1061,11 @@ static int acl_modify(struct ldb_module *module, struct ldb_request *req) goto success; } - guid = get_oc_guid_from_message(schema, acl_res->msgs[0]); - if (!guid) { + objectclass = dsdb_get_structural_oc_from_msg(schema, acl_res->msgs[0]); + if (!objectclass) { talloc_free(tmp_ctx); return ldb_error(ldb, LDB_ERR_OPERATIONS_ERROR, - "acl_modify: Error retrieving object class GUID."); + "acl_modify: Error retrieving object class for GUID."); } sid = samdb_result_dom_sid(req, acl_res->msgs[0], "objectSid"); for (i=0; i < msg->num_elements; i++) { @@ -1129,7 +1129,7 @@ static int acl_modify(struct ldb_module *module, struct ldb_request *req) req, sd, sid, - guid, + &objectclass->schemaIDGUID, attr); if (ret != LDB_SUCCESS) { goto fail; @@ -1146,7 +1146,7 @@ static int acl_modify(struct ldb_module *module, struct ldb_request *req) req, sd, sid, - guid, + &objectclass->schemaIDGUID, userPassword); if (ret != LDB_SUCCESS) { goto fail; @@ -1157,7 +1157,7 @@ static int acl_modify(struct ldb_module *module, struct ldb_request *req) req, sd, sid, - guid, + &objectclass->schemaIDGUID, attr); if (ret != LDB_SUCCESS) { goto fail; @@ -1166,7 +1166,9 @@ static int acl_modify(struct ldb_module *module, struct ldb_request *req) struct object_tree *root = NULL; struct object_tree *new_node = NULL; - if (!insert_in_object_tree(tmp_ctx, guid, SEC_ADS_WRITE_PROP, + if (!insert_in_object_tree(tmp_ctx, + &objectclass->schemaIDGUID, + SEC_ADS_WRITE_PROP, &root, &new_node)) { talloc_free(tmp_ctx); return ldb_error(ldb, LDB_ERR_OPERATIONS_ERROR, |