From 8e299634d9ad3d4facdefd39e8d9442bacb22ba0 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 24 Aug 2013 18:44:20 -0700 Subject: [PATCH] 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. --- source3/smbd/trans2.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 55272e9018f..bafd3f76dd2 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); } } -- 2.11.4.GIT