diff options
| author | Jeremy Allison <jra@samba.org> | 2013-08-21 12:20:48 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-08-25 01:02:40 +0200 |
| commit | cf86adc4419f2636a0b24824ab04ebfcd5bb074d (patch) | |
| tree | 7a9b28b6ad78e3fdbfa79ccc4c0210671e56acd4 | |
| parent | ce776551abb07f18cf302ee7c0c437ee27952099 (diff) | |
| download | samba-cf86adc4419f2636a0b24824ab04ebfcd5bb074d.tar.gz samba-cf86adc4419f2636a0b24824ab04ebfcd5bb074d.tar.bz2 samba-cf86adc4419f2636a0b24824ab04ebfcd5bb074d.zip | |
Fix the UNIX extensions CHOWN calls to use FCHOWN if available, else LCHOWN.
UNIX calls never deref links.
Signed-off-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sun Aug 25 01:02:40 CEST 2013 on sn-devel-104
| -rw-r--r-- | source3/smbd/trans2.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 55272e9018..04947d3c8a 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -7148,12 +7148,12 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn, (unsigned int)set_owner, smb_fname_str_dbg(smb_fname))); - if (S_ISLNK(sbuf.st_ex_mode)) { + if (fsp && fsp->fh->fd != -1) { + ret = SMB_VFS_FCHOWN(fsp, set_owner, (gid_t)-1); + } else { + /* UNIX calls always operate on symlinks. */ ret = SMB_VFS_LCHOWN(conn, smb_fname->base_name, set_owner, (gid_t)-1); - } else { - ret = SMB_VFS_CHOWN(conn, smb_fname->base_name, - set_owner, (gid_t)-1); } if (ret != 0) { @@ -7171,12 +7171,20 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn, if ((set_grp != (uid_t)SMB_GID_NO_CHANGE) && (sbuf.st_ex_gid != set_grp)) { + int ret; + DEBUG(10,("smb_set_file_unix_basic: SMB_SET_FILE_UNIX_BASIC " "changing group %u for file %s\n", (unsigned int)set_owner, smb_fname_str_dbg(smb_fname))); - if (SMB_VFS_CHOWN(conn, smb_fname->base_name, (uid_t)-1, - set_grp) != 0) { + if (fsp && fsp->fh->fd != -1) { + ret = SMB_VFS_FCHOWN(fsp, set_owner, (gid_t)-1); + } else { + /* UNIX calls always operate on symlinks. */ + ret = SMB_VFS_LCHOWN(conn, smb_fname->base_name, (uid_t)-1, + set_grp); + } + if (ret != 0) { status = map_nt_error_from_unix(errno); if (delete_on_fail) { SMB_VFS_UNLINK(conn, smb_fname); |