summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-05-27 06:55:06 +0000
committerTim Potter <tpot@samba.org>2003-05-27 06:55:06 +0000
commitb68e0b3aaea800ac668f9ee22b42fae6a783c8b5 (patch)
tree15ebdae161fa0e1edab934d70146977e9801f798
parentce17f40e0c5ca03e8eaadb55654c07f0377217e4 (diff)
downloadsamba-b68e0b3aaea800ac668f9ee22b42fae6a783c8b5.tar.gz
samba-b68e0b3aaea800ac668f9ee22b42fae6a783c8b5.tar.bz2
samba-b68e0b3aaea800ac668f9ee22b42fae6a783c8b5.zip
Fix shadow parameter warning in free_empty_sys_acl()
(This used to be commit 1b2b7766c8fa89f46f4d1c881ee91c4b0b15773a)
-rw-r--r--source3/smbd/posix_acls.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 3824afe3c4..8da12b9b68 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -2097,17 +2097,17 @@ static struct canon_ace *canon_ace_entry_for(struct canon_ace *list, SMB_ACL_TAG
****************************************************************************/
-SMB_ACL_T free_empty_sys_acl(connection_struct *conn, SMB_ACL_T acl)
+SMB_ACL_T free_empty_sys_acl(connection_struct *conn, SMB_ACL_T the_acl)
{
SMB_ACL_ENTRY_T entry;
- if (!acl)
+ if (!the_acl)
return NULL;
- if (SMB_VFS_SYS_ACL_GET_ENTRY(conn, acl, SMB_ACL_FIRST_ENTRY, &entry) != 1) {
- SMB_VFS_SYS_ACL_FREE_ACL(conn, acl);
+ if (SMB_VFS_SYS_ACL_GET_ENTRY(conn, the_acl, SMB_ACL_FIRST_ENTRY, &entry) != 1) {
+ SMB_VFS_SYS_ACL_FREE_ACL(conn, the_acl);
return NULL;
}
- return acl;
+ return the_acl;
}
/****************************************************************************