diff options
| author | Michael Adam <obnox@samba.org> | 2008-01-08 01:14:24 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-01-08 01:14:24 +0100 |
| commit | b2182c11eab0e1b2f0acb5d82aec86d4598573eb (patch) | |
| tree | afcdbd523fdce750ae9569808ceb68b59649e8db /source3/smbd | |
| parent | 65fc5dbedd1b858d7406e4691e2ecc663ba756ce (diff) | |
| download | samba-b2182c11eab0e1b2f0acb5d82aec86d4598573eb.tar.gz samba-b2182c11eab0e1b2f0acb5d82aec86d4598573eb.tar.bz2 samba-b2182c11eab0e1b2f0acb5d82aec86d4598573eb.zip | |
Remove redundant parameter fd from SMB_VFS_FCHMOD_ACL().
Michael
(This used to be commit 7b201c177b3668f54751ba17d6a0b53ed913e7f7)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/open.c | 5 | ||||
| -rw-r--r-- | source3/smbd/posix_acls.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index b618092a32..4abe017380 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1887,7 +1887,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn, int saved_errno = errno; /* We might get ENOSYS in the next * call.. */ - if (SMB_VFS_FCHMOD_ACL(fsp, fsp->fh->fd, unx_mode) == -1 && + if (SMB_VFS_FCHMOD_ACL(fsp, unx_mode) == -1 && errno == ENOSYS) { errno = saved_errno; /* Ignore ENOSYS */ } @@ -1901,8 +1901,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn, { int saved_errno = errno; /* We might get ENOSYS in the * next call.. */ - ret = SMB_VFS_FCHMOD_ACL(fsp, fsp->fh->fd, - new_unx_mode); + ret = SMB_VFS_FCHMOD_ACL(fsp, new_unx_mode); if (ret == -1 && errno == ENOSYS) { errno = saved_errno; /* Ignore ENOSYS */ diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index b07033b8ac..23a246fea7 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -3802,7 +3802,7 @@ int inherit_access_acl(connection_struct *conn, const char *inherit_from_dir, and set the mask to rwx. Needed to preserve complex ACLs set by NT. ****************************************************************************/ -int fchmod_acl(files_struct *fsp, int fd, mode_t mode) +int fchmod_acl(files_struct *fsp, mode_t mode) { connection_struct *conn = fsp->conn; SMB_ACL_T posix_acl = NULL; |