[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  232abcc s3: smbd: When deleting an fsp pointer ensure we don't keep any references to it around.
      from  a2436b6 messaging: Deliver messages only once

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


- Log -----------------------------------------------------------------
commit 232abcc93277b8c6235b1656bfcdcbac5688ed48
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jun 20 11:20:38 2017 -0700

    s3: smbd: When deleting an fsp pointer ensure we don't keep any references to it around.
    
    Based on a suggestion from <lev at zadarastorage.com>
    
    https://bugzilla.samba.org/show_bug.cgi?id=12818
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Richard Sharpe <realrichardsharpe at gmail.com>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Jun 22 00:12:49 CEST 2017 on sn-devel-144

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

Summary of changes:
 source3/smbd/files.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 6d0f05b..303ab7b 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -552,9 +552,7 @@ void file_free(struct smb_request *req, files_struct *fsp)
 	 * Clear all possible chained fsp
 	 * pointers in the SMB2 request queue.
 	 */
-	if (req != NULL && req->smb2req) {
-		remove_smb2_chained_fsp(fsp);
-	}
+	remove_smb2_chained_fsp(fsp);
 
 	/* Drop all remaining extensions. */
 	vfs_remove_all_fsp_extensions(fsp);


-- 
Samba Shared Repository