[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  5f9dbf3decd s3: smbd: Add missing pop_sec_ctx() in error code path of close_directory()
      from  7163846a491 ctdb-protocol: Print IPv6 sockets with RFC5952 "[2001:db8::1]:80" notation

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


- Log -----------------------------------------------------------------
commit 5f9dbf3decd17129f360cbe14383cc79e20fb70b
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 12 10:42:48 2022 -0800

    s3: smbd: Add missing pop_sec_ctx() in error code path of close_directory()
    
    If delete_all_streams() fails.
    
    Found by Andrew Walker <awalker at ixsystems.com>
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14944
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Christof Schmitt <cs at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Jan 14 03:34:47 UTC 2022 on sn-devel-184

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

Summary of changes:
 source3/smbd/close.c | 2 ++
 1 file changed, 2 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 610450d086f..8abd3fb3861 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1430,6 +1430,8 @@ static NTSTATUS close_directory(struct smb_request *req, files_struct *fsp,
 				DEBUG(5, ("delete_all_streams failed: %s\n",
 					  nt_errstr(status)));
 				file_free(req, fsp);
+				/* unbecome user. */
+				pop_sec_ctx();
 				return status;
 			}
 		}


-- 
Samba Shared Repository