[SCM] Samba Shared Repository - branch v4-19-test updated

[Jule Anger]

The branch, v4-19-test has been updated
       via  d70374c3479 s3: libsmb: Add a missing return statement in the timeout case.
      from  374ba0d2c9a nsswitch/wb_common.c: fix socket fd and memory leaks of global state

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-19-test


- Log -----------------------------------------------------------------
commit d70374c347953d64e9a6cf56db178d42f985227d
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Aug 16 17:24:37 2023 -0700

    s3: libsmb: Add a missing return statement in the timeout case.
    
    Obvious fix (needs a malicious server to recreate).
    
    Found by Robert Morris <rtm at lcs.mit.edu>
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15426
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit d27c2f2a47dc488ee32dd28d01697bfc409dff77)
    
    Autobuild-User(v4-19-test): Jule Anger <janger at samba.org>
    Autobuild-Date(v4-19-test): Wed Sep 20 16:23:32 UTC 2023 on atb-devel-224

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

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


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 4321c216473..6696ed3ea05 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -202,6 +202,7 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
 			 c->timeout,
 			 smbXcli_conn_remote_name(c->conn));
 		cli_shutdown(c);
+		return status;
 	} else if (!NT_STATUS_IS_OK(status)) {
 		d_printf("Protocol negotiation to server %s (for a protocol between %s and %s) failed: %s\n",
 			 smbXcli_conn_remote_name(c->conn),


-- 
Samba Shared Repository