summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-10-19 13:32:53 -0700
committerJeremy Allison <jra@samba.org>2010-10-19 22:53:38 +0000
commit45794dd30a7717aafba40864c1843e47098a4502 (patch)
tree489a6b52924df529e9274ea341f94ba52e7d895e
parente7d0f478ee529500461f80f2fd51987c9255d345 (diff)
downloadsamba-45794dd30a7717aafba40864c1843e47098a4502.tar.gz
samba-45794dd30a7717aafba40864c1843e47098a4502.tar.bz2
samba-45794dd30a7717aafba40864c1843e47098a4502.zip
Fix shadow warning for "access" variable.
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Tue Oct 19 22:53:38 UTC 2010 on sn-devel-104
-rw-r--r--libcli/security/object_tree.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libcli/security/object_tree.c b/libcli/security/object_tree.c
index 7c7d644543..6fa9585365 100644
--- a/libcli/security/object_tree.c
+++ b/libcli/security/object_tree.c
@@ -109,13 +109,13 @@ struct object_tree *get_object_tree_by_GUID(struct object_tree *root,
/* Change the granted access per each ACE */
void object_tree_modify_access(struct object_tree *root,
- uint32_t access)
+ uint32_t access_mask)
{
- root->remaining_access &= ~access;
+ root->remaining_access &= ~access_mask;
if (root->num_of_children > 0) {
int i;
for (i = 0; i < root->num_of_children; i++) {
- object_tree_modify_access(&root->children[i], access);
+ object_tree_modify_access(&root->children[i], access_mask);
}
}
}