diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-12-06 11:06:27 +0100 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-12-06 11:28:58 +0100 |
| commit | 93d85ca5fd57d87e720ab627865f0e5af25e07b5 (patch) | |
| tree | d0591aad81be76086989cf26727aaf59bb2ebef5 /source4/dsdb/common | |
| parent | 5845cc94a99bcb2115c6edbd1711444e640c40d4 (diff) | |
| download | samba-93d85ca5fd57d87e720ab627865f0e5af25e07b5.tar.gz samba-93d85ca5fd57d87e720ab627865f0e5af25e07b5.tar.bz2 samba-93d85ca5fd57d87e720ab627865f0e5af25e07b5.zip | |
s4:fix some shadowed declaration warnings on Solaris by renaming the symbols
Diffstat (limited to 'source4/dsdb/common')
| -rw-r--r-- | source4/dsdb/common/dsdb_access.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/dsdb/common/dsdb_access.c b/source4/dsdb/common/dsdb_access.c index ebbe4f43b1..39e67b7793 100644 --- a/source4/dsdb/common/dsdb_access.c +++ b/source4/dsdb/common/dsdb_access.c @@ -87,7 +87,7 @@ int dsdb_check_access_on_dn_internal(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, struct security_token *token, struct ldb_dn *dn, - uint32_t access, + uint32_t access_mask, const struct GUID *guid) { struct security_descriptor *sd = NULL; @@ -108,12 +108,13 @@ int dsdb_check_access_on_dn_internal(struct ldb_context *ldb, } sid = samdb_result_dom_sid(mem_ctx, acl_res->msgs[0], "objectSid"); if (guid) { - if (!insert_in_object_tree(mem_ctx, guid, access, &root, &new_node)) { + if (!insert_in_object_tree(mem_ctx, guid, access_mask, &root, + &new_node)) { return ldb_operr(ldb); } } status = sec_access_check_ds(sd, token, - access, + access_mask, &access_granted, root, sid); @@ -137,7 +138,7 @@ int dsdb_check_access_on_dn(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, struct ldb_dn *dn, struct security_token *token, - uint32_t access, + uint32_t access_mask, const char *ext_right) { int ret; @@ -163,7 +164,7 @@ int dsdb_check_access_on_dn(struct ldb_context *ldb, mem_ctx, token, dn, - access, + access_mask, &guid); } |