[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  795ec75 s3: libsmbclient: Fix hard-coded connection error return of ETIMEDOUT.
      from  0c78aa1 s3: VFS: Default. Move vfs_read_data() out of source3/smbd/vfs.c to the printing code, which is the only caller.

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


- Log -----------------------------------------------------------------
commit 795ec751ac5f6e58966385bec25063c4af4f185d
Author: Jeremy Allison <jra at samba.org>
Date:   Wed May 2 11:19:31 2018 -0700

    s3: libsmbclient: Fix hard-coded connection error return of ETIMEDOUT.
    
    We shouldn't hard-code the connection error as ETIMEDOUT when
    we have a perfectly good NT_STATUS to map from.
    
    Found by the ChromeOS guys trying to connect an SMB2-only client
    to an SMB1-only supporting server.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13419
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Volker Lendecke <Volker.Lendecke at SerNet.DE>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu May  3 02:42:20 CEST 2018 on sn-devel-144

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

Summary of changes:
 source3/libsmb/libsmb_server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index e6067be..67dfcf7 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -500,7 +500,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
 				 lp_client_max_protocol());
 	if (!NT_STATUS_IS_OK(status)) {
 		cli_shutdown(c);
-		errno = ETIMEDOUT;
+		errno = map_errno_from_nt_status(status);
 		return NULL;
 	}
 


-- 
Samba Shared Repository