From: Jeremy Allison Date: Wed, 2 May 2018 18:19:31 +0000 (-0700) Subject: s3: libsmbclient: Fix hard-coded connection error return of ETIMEDOUT. X-Git-Tag: samba-4.8.2~11 X-Git-Url: http://git.samba.org/samba.git/?p=vlendec%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=02b898e44d3b71670473cd7698b27d7448d0a96e 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 Reviewed-by: Volker Lendecke Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu May 3 02:42:20 CEST 2018 on sn-devel-144 (cherry picked from commit 795ec751ac5f6e58966385bec25063c4af4f185d) Autobuild-User(v4-8-test): Karolin Seeger Autobuild-Date(v4-8-test): Mon May 7 14:25:28 CEST 2018 on sn-devel-144 --- diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c index e6067be2013..67dfcf72327 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; }