summaryrefslogtreecommitdiffstats
path: root/source3/modules/vfs_solarisacl.c
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-08 01:54:19 +0100
committerMichael Adam <obnox@samba.org>2008-01-08 01:54:19 +0100
commit5921607f2647cec20a6bcebd17c5a0c53449c1ba (patch)
tree09b0b2af053045a0568649292e6af3e09a125a43 /source3/modules/vfs_solarisacl.c
parentb2182c11eab0e1b2f0acb5d82aec86d4598573eb (diff)
downloadsamba-5921607f2647cec20a6bcebd17c5a0c53449c1ba.tar.gz
samba-5921607f2647cec20a6bcebd17c5a0c53449c1ba.tar.xz
samba-5921607f2647cec20a6bcebd17c5a0c53449c1ba.zip
Remove redundant parameter fd from SMB_VFS_SYS_ACL_SET_FD().
Michael (This used to be commit 9296e93588c0e795cae770765050247ac1474a74)
Diffstat (limited to 'source3/modules/vfs_solarisacl.c')
-rw-r--r--source3/modules/vfs_solarisacl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c
index cda243f8c15..ce763f07e7b 100644
--- a/source3/modules/vfs_solarisacl.c
+++ b/source3/modules/vfs_solarisacl.c
@@ -1,7 +1,7 @@
/*
Unix SMB/Netbios implementation.
VFS module to get and set Solaris ACLs
- Copyright (C) Michael Adam 2006
+ Copyright (C) Michael Adam 2006,2008
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -219,7 +219,7 @@ int solarisacl_sys_acl_set_file(vfs_handle_struct *handle,
*/
int solarisacl_sys_acl_set_fd(vfs_handle_struct *handle,
files_struct *fsp,
- int fd, SMB_ACL_T theacl)
+ SMB_ACL_T theacl)
{
SOLARIS_ACL_T solaris_acl = NULL;
SOLARIS_ACL_T default_acl = NULL;
@@ -242,7 +242,7 @@ int solarisacl_sys_acl_set_fd(vfs_handle_struct *handle,
strerror(errno)));
goto done;
}
- if (!solaris_acl_get_fd(fd, &default_acl, &default_count)) {
+ if (!solaris_acl_get_fd(fsp->fh->fd, &default_acl, &default_count)) {
DEBUG(10, ("error getting (default) acl from fd\n"));
goto done;
}
@@ -258,7 +258,7 @@ int solarisacl_sys_acl_set_fd(vfs_handle_struct *handle,
goto done;
}
- ret = facl(fd, SETACL, count, solaris_acl);
+ ret = facl(fsp->fh->fd, SETACL, count, solaris_acl);
if (ret != 0) {
DEBUG(10, ("call of facl failed (%s).\n", strerror(errno)));
}