summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-05-27 06:54:35 +0000
committerTim Potter <tpot@samba.org>2003-05-27 06:54:35 +0000
commitaa24267f1c7dafbcddd659a7976bcc66d64024f6 (patch)
treea753b8660f6ad70a03404df3a811542f1b4c51f2
parent19d75b2df77b1db11805278b3845a0923177c355 (diff)
downloadsamba-aa24267f1c7dafbcddd659a7976bcc66d64024f6.tar.gz
samba-aa24267f1c7dafbcddd659a7976bcc66d64024f6.tar.bz2
samba-aa24267f1c7dafbcddd659a7976bcc66d64024f6.zip
Fix shadow parameter warning in free_empty_sys_acl()
(This used to be commit 7345bca285a4fed294a6120a399fa2fa3d88a440)
-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 86efd8fb96..e2cc3af281 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 (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;
}
/****************************************************************************