diff options
| author | Jeremy Allison <jra@samba.org> | 2011-02-04 17:48:10 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-02-05 03:33:58 +0100 |
| commit | df34e804fc1a44e6ff096fbaf7a643778e857481 (patch) | |
| tree | 2714242fa01fd60b8f4b0c6817d84bc34e44d123 /source3/smbd/vfs.c | |
| parent | ece94989b8a9e39d080d58bb82958c201af79f0d (diff) | |
| download | samba-df34e804fc1a44e6ff096fbaf7a643778e857481.tar.gz samba-df34e804fc1a44e6ff096fbaf7a643778e857481.tar.bz2 samba-df34e804fc1a44e6ff096fbaf7a643778e857481.zip | |
Fix try_chown code. Use new vfs_chown_fsp() which always trys fd first.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sat Feb 5 03:33:59 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/smbd/vfs.c')
| -rw-r--r-- | source3/smbd/vfs.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index 802639f2fb..9e44d02e15 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -1439,6 +1439,36 @@ int smb_vfs_call_lchown(struct vfs_handle_struct *handle, const char *path, return handle->fns->lchown(handle, path, uid, gid); } +NTSTATUS vfs_chown_fsp(files_struct *fsp, uid_t uid, gid_t gid) +{ + int ret; + + if (!fsp->is_directory && fsp->fh->fd != -1) { + /* Try fchown. */ + ret = SMB_VFS_FCHOWN(fsp, uid, gid); + if (ret == 0) { + return NT_STATUS_OK; + } + if (ret == -1 && errno != ENOSYS) { + return map_nt_error_from_unix(errno); + } + } + + if (fsp->posix_open) { + ret = SMB_VFS_LCHOWN(fsp->conn, + fsp->fsp_name->base_name, + uid, gid); + } else { + ret = SMB_VFS_CHOWN(fsp->conn, + fsp->fsp_name->base_name, + uid, gid); + } + if (ret == 0) { + return NT_STATUS_OK; + } + return map_nt_error_from_unix(errno); +} + int smb_vfs_call_chdir(struct vfs_handle_struct *handle, const char *path) { VFS_FIND(chdir); |