diff options
| author | Michael Adam <obnox@samba.org> | 2008-01-07 23:53:34 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-01-07 23:54:07 +0100 |
| commit | 62e9d503d82d645cf29af643732ad97c0eb8b340 (patch) | |
| tree | 494195be6bd575a41a334f602b6fe0456390c072 /source3/modules/vfs_aixacl.c | |
| parent | a8d200893a0a7bfbd5a33a52fbe47c4d14a6ed50 (diff) | |
| download | samba-62e9d503d82d645cf29af643732ad97c0eb8b340.tar.gz samba-62e9d503d82d645cf29af643732ad97c0eb8b340.tar.xz samba-62e9d503d82d645cf29af643732ad97c0eb8b340.zip | |
Remove redundant parameter fd from SMB_VFS_SYS_ACL_GET_FD().
Michael
(This used to be commit 42663e8736e1a3dfb57e0aafdcbf5fec880da779)
Diffstat (limited to 'source3/modules/vfs_aixacl.c')
| -rw-r--r-- | source3/modules/vfs_aixacl.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/modules/vfs_aixacl.c b/source3/modules/vfs_aixacl.c index a60470ffc95..1a76ed68789 100644 --- a/source3/modules/vfs_aixacl.c +++ b/source3/modules/vfs_aixacl.c @@ -80,8 +80,7 @@ SMB_ACL_T aixacl_sys_acl_get_file(vfs_handle_struct *handle, } SMB_ACL_T aixacl_sys_acl_get_fd(vfs_handle_struct *handle, - files_struct *fsp, - int fd) + files_struct *fsp) { struct acl *file_acl = (struct acl *)NULL; @@ -93,7 +92,7 @@ SMB_ACL_T aixacl_sys_acl_get_fd(vfs_handle_struct *handle, /* Get the acl using fstatacl */ DEBUG(10,("Entering AIX sys_acl_get_fd\n")); - DEBUG(10,("fd is %d\n",fd)); + DEBUG(10,("fd is %d\n",fsp->fh->fd)); file_acl = (struct acl *)SMB_MALLOC(BUFSIZ); if(file_acl == NULL) { @@ -104,7 +103,7 @@ SMB_ACL_T aixacl_sys_acl_get_fd(vfs_handle_struct *handle, memset(file_acl,0,BUFSIZ); - rc = fstatacl(fd,0,file_acl,BUFSIZ); + rc = fstatacl(fsp->fh->fd,0,file_acl,BUFSIZ); if( (rc == -1) && (errno == ENOSPC)) { struct acl *new_acl = SMB_MALLOC(file_acl->acl_len + sizeof(struct acl)); if( new_acl == NULL) { @@ -113,7 +112,7 @@ SMB_ACL_T aixacl_sys_acl_get_fd(vfs_handle_struct *handle, return NULL; } file_acl = new_acl; - rc = fstatacl(fd,0,file_acl,file_acl->acl_len + sizeof(struct acl)); + rc = fstatacl(fsp->fh->fd,0,file_acl,file_acl->acl_len + sizeof(struct acl)); if( rc == -1) { DEBUG(0,("fstatacl returned %d with errno %d\n",rc,errno)); SAFE_FREE(file_acl); |