[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  c7e6db97de9 smbd: Add an error return END_PROFILE call
      from  465e518d6cc classicupgrade: fix a a bytes-like object is required, not 'str' error

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


- Log -----------------------------------------------------------------
commit c7e6db97de967e902529fa9e902cdcdf2a159403
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Sep 20 08:37:28 2019 -0700

    smbd: Add an error return END_PROFILE call
    
    All other return; statements in reply_tcon_and_X have this
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Mon Sep 23 17:06:25 UTC 2019 on sn-devel-184

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

Summary of changes:
 source3/smbd/reply.c | 1 +
 1 file changed, 1 insertion(+)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index dcd46dd574c..14019bda9a4 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1048,6 +1048,7 @@ void reply_tcon_and_X(struct smb_request *req)
 			if (!NT_STATUS_IS_OK(status)) {
 				DBG_ERR("smb_key_derivation failed: %s\n",
 					nt_errstr(status));
+				END_PROFILE(SMBtconX);
 				return;
 			}
 			optional_support |= SMB_EXTENDED_SIGNATURES;


-- 
Samba Shared Repository