Fix shadow warning for "access" variable.
authorJeremy Allison <jra@samba.org>
Tue, 19 Oct 2010 20:32:53 +0000 (13:32 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 19 Oct 2010 22:53:38 +0000 (22:53 +0000)
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Oct 19 22:53:38 UTC 2010 on sn-devel-104

libcli/security/object_tree.c

index 7c7d644543f164054b1420b1eec0c04ca2c6d21f..6fa9585365f2762d50fb4289f01e5d116de73f4c 100644 (file)
@@ -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);
                }
        }
 }