[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  b8f3d8d052c smbd: if close fails just log it, don't crash
      from  4f5faa806e8 docs-xml:manpages: update vfs_fileid.8.xml for the recent changes

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


- Log -----------------------------------------------------------------
commit b8f3d8d052c38a273599d839d753840a07b3f5cd
Author: Ralph Boehme <slow at samba.org>
Date:   Thu Jul 7 14:40:28 2022 +0200

    smbd: if close fails just log it, don't crash
    
    Originally I added the assert here as we can't return the error being in a
    talloc destructor. But OEMs prefer error log messages over crashes.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Jul  8 09:04:28 UTC 2022 on sn-devel-184

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

Summary of changes:
 source3/smbd/files.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index f4737278dd0..45cc7ffd79f 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -424,12 +424,20 @@ static int smb_fname_fsp_destructor(struct smb_filename *smb_fname)
 		fsp_set_base_fsp(fsp, NULL);
 
 		status = fd_close(tmp_base_fsp);
-		SMB_ASSERT(NT_STATUS_IS_OK(status));
+		if (NT_STATUS_IS_OK(status)) {
+			DBG_ERR("Closing fd for fsp [%s] failed: %s. "
+				"Please check your filesystem!!!\n",
+				fsp_str_dbg(fsp), nt_errstr(status));
+		}
 		file_free(NULL, tmp_base_fsp);
 	}
 
 	status = fd_close(fsp);
-	SMB_ASSERT(NT_STATUS_IS_OK(status));
+	if (NT_STATUS_IS_OK(status)) {
+		DBG_ERR("Closing fd for fsp [%s] failed: %s. "
+			"Please check your filesystem!!!\n",
+			fsp_str_dbg(fsp), nt_errstr(status));
+	}
 	file_free(NULL, fsp);
 	smb_fname->fsp = NULL;
 


-- 
Samba Shared Repository