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/include | |
| 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/include')
| -rw-r--r-- | source3/include/proto.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 1801164981..9a81fa273d 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -241,7 +241,7 @@ void standard_sub_vsnum(char *str, user_struct *vuser, int snum); /*The following definitions come from lib/sysacls.c */ -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); int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); @@ -251,8 +251,8 @@ int sys_acl_free( void *obj_p); int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); -char *sys_acl_to_text( SMB_ACL_T acl, ssize_t *plen); -int sys_acl_get_entry( SMB_ACL_T acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); +char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen); +int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d); @@ -262,7 +262,7 @@ int sys_acl_free( void *obj_p); int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset); int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T 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); /*The following definitions come from lib/system.c */ |