s4: fix various warnings (not "const" related ones)

[sfrench/samba-autobuild/.git] / source4 / libcli / security / object_tree.c

diff --git a/source4/libcli/security/object_tree.c b/source4/libcli/security/object_tree.c
index 8a90019a59ee39854275e6a08dff360b3b7552ee..85b407913c518d340a03c52f522f6480c737e925 100644 (file)
--- a/source4/libcli/security/object_tree.c
+++ b/source4/libcli/security/object_tree.c
@@ -94,13 +94,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)
 {
        struct object_tree *p;
        if (root){
-               root->remaining_access &= ~access;
+               root->remaining_access &= ~access_mask;
        }
 
        for (p = root->children; p != NULL; p = p->next)
-               object_tree_modify_access(p, access);
+               object_tree_modify_access(p, access_mask);
 }