diff options
| author | Jeremy Allison <jra@samba.org> | 2013-08-24 18:44:20 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-08-24 18:44:20 -0700 |
| commit | 8e299634d9ad3d4facdefd39e8d9442bacb22ba0 (patch) | |
| tree | c3acf0a9cfc04cd0c128362a741776ac593be437 /source3/smbd/trans2.c | |
| parent | 9cbd4fcd1e7ef87e564a0ffa07940af6f26f4e2b (diff) | |
| download | samba-8e299634d9ad3d4facdefd39e8d9442bacb22ba0.tar.gz samba-8e299634d9ad3d4facdefd39e8d9442bacb22ba0.tar.bz2 samba-8e299634d9ad3d4facdefd39e8d9442bacb22ba0.zip | |
Revert "Allow UNIX extensions client to act on open fsp instead of pathname if available."
Pushed from the wrong branch - this is the version
without Simo's review changes. Apologies to all
and I'll re-submit in less of a haste after the
weekend.
This reverts commit ce776551abb07f18cf302ee7c0c437ee27952099.
Diffstat (limited to 'source3/smbd/trans2.c')
| -rw-r--r-- | source3/smbd/trans2.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 55272e9018..bafd3f76dd 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -7119,18 +7119,11 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn, */ if (raw_unixmode != SMB_MODE_NO_CHANGE) { - int ret; - DEBUG(10,("smb_set_file_unix_basic: SMB_SET_FILE_UNIX_BASIC " "setting mode 0%o for file %s\n", (unsigned int)unixmode, smb_fname_str_dbg(smb_fname))); - if (fsp && fsp->fh->fd != -1) { - ret = SMB_VFS_FCHMOD(fsp, unixmode); - } else { - ret = SMB_VFS_CHMOD(conn, smb_fname->base_name, unixmode); - } - if (ret != 0) { + if (SMB_VFS_CHMOD(conn, smb_fname->base_name, unixmode) != 0) { return map_nt_error_from_unix(errno); } } |