git.samba.org
/
tprouty
/
samba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix shadow parameter warning in free_empty_sys_acl()
[tprouty/samba.git]
/
source
/
smbd
/
posix_acls.c
diff --git
a/source/smbd/posix_acls.c
b/source/smbd/posix_acls.c
index 3824afe3c4770821fbb877b192635481eb80fc06..8da12b9b68036b29f26fed653f3d3a2f4f6a79df 100644
(file)
--- a/
source/smbd/posix_acls.c
+++ b/
source/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;
{
SMB_ACL_ENTRY_T entry;
- if (!acl)
+ if (!
the_
acl)
return NULL;
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 NULL;
}
- return acl;
+ return
the_
acl;
}
/****************************************************************************
}
/****************************************************************************