Attachment 13561 Details for Bug 13007 – git-am fix for master

[patch] git-am fix for master

0001-libsmbclient-Allow-server-NetApp-to-return-STATUS_IN.patch (text/plain), 1.19 KB, created by Jeremy Allison on 2017-09-08 23:22:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-09-08 23:22:47 UTC

Size: 1.19 KB

patch

obsolete

>From f8e4352ecee651c31805b147da8089ac28910f59 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 8 Sep 2017 16:20:34 -0700
>Subject: [PATCH] libsmbclient: Allow server (NetApp) to return
> STATUS_INVALID_PARAMETER from an echo.
>
>It does this if we send a session ID of zero. The server still replied.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13007
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/libsmb/libsmb_server.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
>diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
>index b0e5926fa65..2d41f2facf3 100644
>--- a/source3/libsmb/libsmb_server.c
>+++ b/source3/libsmb/libsmb_server.c
>@@ -61,7 +61,16 @@ SMBC_check_server(SMBCCTX * context,
> 					1,
> 					data_blob_const(data, sizeof(data)));
> 		if (!NT_STATUS_IS_OK(status)) {
>-			return 1;
>+			/*
>+			 * Some NetApp servers return
>+			 * NT_STATUS_INVALID_PARAMETER.That's OK, they still
>+			 * replied.
>+			 * BUG: https://bugzilla.samba.org/show_bug.cgi?id=13007
>+			 */
>+			if (!NT_STATUS_EQUAL(status,
>+					NT_STATUS_INVALID_PARAMETER)) {
>+				return 1;
>+			}
> 		}
> 		server->last_echo_time = now;
> 	}
>-- 
>2.14.1.581.gf28d330327-goog
>

Actions: View

Attachments on bug 13007: 13561 | 13562 | 13779