diff options
| author | Tim Potter <tpot@samba.org> | 2000-12-14 05:38:05 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2000-12-14 05:38:05 +0000 |
| commit | 624431c98b78185bf402562d4194a98d86a60bcc (patch) | |
| tree | 59f91e83a2773fa46c76a85620ada53fc8e28d8f /source3/lib | |
| parent | 478ffc48ee2e07d14abe85160c643752e1135b2e (diff) | |
| download | samba-624431c98b78185bf402562d4194a98d86a60bcc.tar.gz samba-624431c98b78185bf402562d4194a98d86a60bcc.tar.bz2 samba-624431c98b78185bf402562d4194a98d86a60bcc.zip | |
Renamed parameters and variables called acl to the_acl as it conflicts
with a Solaris system call.
(This used to be commit 5e547ddcb526be5562db9213c5b36e505e735a2e)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/sysacls.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c index 2412fb7b0e..e2cf535d3e 100644 --- a/source3/lib/sysacls.c +++ b/source3/lib/sysacls.c @@ -51,9 +51,9 @@ extern int DEBUGLEVEL; /* Identity mapping - easy. */ -int sys_acl_get_entry( SMB_ACL_T acl, int entry_id, SMB_ACL_ENTRY_T *entry_p) +int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p) { - return acl_get_entry( acl, entry_id, entry_p); + return acl_get_entry( the_acl, entry_id, entry_p); } int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p) @@ -101,9 +101,9 @@ int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm) return acl_get_perm(permset, perm); } -char *sys_acl_to_text( SMB_ACL_T acl, ssize_t *plen) +char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen) { - return acl_to_text( acl, plen); + return acl_to_text( the_acl, plen); } #elif defined(HAVE_SOLARIS_ACLS) @@ -112,7 +112,7 @@ char *sys_acl_to_text( SMB_ACL_T acl, ssize_t *plen) #else /* No ACLs. */ -int sys_acl_get_entry( SMB_ACL_T acl, int entry_id, SMB_ACL_ENTRY_T *entry_p) +int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p) { return -1; } @@ -162,7 +162,7 @@ int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm) return (permset & perm) ? 1 : 0; } -char *sys_acl_to_text( SMB_ACL_T acl, ssize_t *plen) +char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen) { return NULL; } |