mirror of
https://github.com/samba-team/samba.git
synced 2025-01-26 10:04:02 +03:00
Fix shadow parameter warning in free_empty_sys_acl()
(This used to be commit 7345bca285a4fed294a6120a399fa2fa3d88a440)
This commit is contained in:
parent
19d75b2df7
commit
aa24267f1c
@ -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 (conn->vfs_ops.sys_acl_get_entry(conn, acl, SMB_ACL_FIRST_ENTRY, &entry) != 1) {
|
||||
conn->vfs_ops.sys_acl_free_acl(conn, acl);
|
||||
if (conn->vfs_ops.sys_acl_get_entry(conn, the_acl, SMB_ACL_FIRST_ENTRY, &entry) != 1) {
|
||||
conn->vfs_ops.sys_acl_free_acl(conn, the_acl);
|
||||
return NULL;
|
||||
}
|
||||
return acl;
|
||||
return the_acl;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
|
Loading…
x
Reference in New Issue
Block a user