Revert "Allow UNIX extensions client to act on open fsp instead of pathname if availa...

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.

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 55272e9018f3283fe04a020c77ad3dcab5386db7..bafd3f76dd29e3a9f66038d0ba00f978c7bcee92 100644 (file)
--- 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);
                }
        }