[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  5fa7f73b147 s3: smbd: In setup_close_full_information(), remove unneeded vfs_stat().
      from  20c85cc1da8 pam_winbind: add new pwd_change_prompt option (defaults to off).

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5fa7f73b14790f4c581fb2bd4d67cd5561e79b6a
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 15 10:41:39 2021 -0800

    s3: smbd: In setup_close_full_information(), remove unneeded vfs_stat().
    
    After openat_pathref_fsp() is successful we know we have a VALID_STAT().
    
    It either returns NT_STATUS_OK or we look at the stat
    struct for S_ISLNK so we know we have VALID_STAT().
    
    If it's not successful we error out, so we don't need
    another vfs_stat() here.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Dec 16 07:33:09 UTC 2021 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/smb2_close.c | 6 ------
 1 file changed, 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_close.c b/source3/smbd/smb2_close.c
index c218d12b668..648080f1a8c 100644
--- a/source3/smbd/smb2_close.c
+++ b/source3/smbd/smb2_close.c
@@ -163,7 +163,6 @@ static void setup_close_full_information(connection_struct *conn,
 				uint32_t *out_file_attributes)
 {
 	NTSTATUS status;
-	int ret;
 
 	status = openat_pathref_fsp(conn->cwd_fsp, smb_fname);
 	if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND) &&
@@ -176,11 +175,6 @@ static void setup_close_full_information(connection_struct *conn,
 		return;
 	}
 
-	ret = vfs_stat(conn, smb_fname);
-	if (ret != 0) {
-		return;
-	}
-
 	*out_flags = SMB2_CLOSE_FLAGS_FULL_INFORMATION;
 	*out_file_attributes = fdos_mode(smb_fname->fsp);
 	*out_last_write_ts = smb_fname->st.st_ex_mtime;


-- 
Samba Shared Repository