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 | 5e547ddcb526be5562db9213c5b36e505e735a2e (patch) | |
| tree | 02b2fcc815237076a229cc3ba920c2a28b61d802 /source/lib/sysacls.c | |
| parent | bd87398b5a9421add8db8b455d02ccd6b2624f58 (diff) | |
| download | samba-5e547ddcb526be5562db9213c5b36e505e735a2e.tar.gz samba-5e547ddcb526be5562db9213c5b36e505e735a2e.tar.xz samba-5e547ddcb526be5562db9213c5b36e505e735a2e.zip | |
Renamed parameters and variables called acl to the_acl as it conflicts
with a Solaris system call.
Diffstat (limited to 'source/lib/sysacls.c')
| -rw-r--r-- | source/lib/sysacls.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/lib/sysacls.c b/source/lib/sysacls.c index 2412fb7b0e5..e2cf535d3e5 100644 --- a/source/lib/sysacls.c +++ b/source/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; } |