summaryrefslogtreecommitdiff
path: root/source3/modules/nfs4_acls.h
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-02-23 15:03:29 -0800
committerJeremy Allison <jra@samba.org>2009-02-23 15:03:29 -0800
commit0b62cdbed0867d0712821953700062727f668c65 (patch)
tree4eb21582c3cf112c285ef9a5b4c7c3de2dcc4504 /source3/modules/nfs4_acls.h
parent1cd7fe71940b7420dd478321b8368a31ae713917 (diff)
downloadsamba-0b62cdbed0867d0712821953700062727f668c65.tar.gz
samba-0b62cdbed0867d0712821953700062727f668c65.tar.bz2
samba-0b62cdbed0867d0712821953700062727f668c65.zip
Quieten down a boatload of shadowed variable warnings on Solaris.
Makes real problems easier to spot. Jeremy.
Diffstat (limited to 'source3/modules/nfs4_acls.h')
-rw-r--r--source3/modules/nfs4_acls.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/nfs4_acls.h b/source3/modules/nfs4_acls.h
index a227c6e0fc..b2d1196b26 100644
--- a/source3/modules/nfs4_acls.h
+++ b/source3/modules/nfs4_acls.h
@@ -117,26 +117,26 @@ SMB4ACL_T *smb_create_smb4acl(void);
/* prop's contents are copied */
/* it doesn't change the order, appends */
-SMB4ACE_T *smb_add_ace4(SMB4ACL_T *acl, SMB_ACE4PROP_T *prop);
+SMB4ACE_T *smb_add_ace4(SMB4ACL_T *theacl, SMB_ACE4PROP_T *prop);
SMB_ACE4PROP_T *smb_get_ace4(SMB4ACE_T *ace);
/* Returns NULL if none - or error */
-SMB4ACE_T *smb_first_ace4(SMB4ACL_T *acl);
+SMB4ACE_T *smb_first_ace4(SMB4ACL_T *theacl);
/* Returns NULL in the end - or error */
SMB4ACE_T *smb_next_ace4(SMB4ACE_T *ace);
-uint32 smb_get_naces(SMB4ACL_T *acl);
+uint32 smb_get_naces(SMB4ACL_T *theacl);
NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
uint32 security_info,
- SEC_DESC **ppdesc, SMB4ACL_T *acl);
+ SEC_DESC **ppdesc, SMB4ACL_T *theacl);
NTSTATUS smb_get_nt_acl_nfs4(connection_struct *conn,
const char *name,
uint32 security_info,
- SEC_DESC **ppdesc, SMB4ACL_T *acl);
+ SEC_DESC **ppdesc, SMB4ACL_T *theacl);
/* Callback function needed to set the native acl
* when applicable */