1 |
jpp |
1.1 |
From fbef6bd05629e3f5939317bd073a2281fcc3b636 Mon Sep 17 00:00:00 2001 |
2 |
|
|
From: Andreas Schneider <asn@samba.org> |
3 |
|
|
Date: Tue, 30 May 2017 16:30:33 +0200 |
4 |
|
|
Subject: [PATCH] libcli:smb2: Gracefully handle not supported for |
5 |
|
|
FSCTL_VALIDATE_NEGOTIATE_INFO |
6 |
|
|
|
7 |
|
|
If FSCTL_VALIDATE_NEGOTIATE_INFO is not implemented, e.g. in a SMB2 only |
8 |
|
|
server then gracefully handle NT_STATUS_NOT_SUPPORTED too. |
9 |
|
|
|
10 |
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12808 |
11 |
|
|
|
12 |
|
|
Signed-off-by: Andreas Schneider <asn@samba.org> |
13 |
|
|
Signed-off-by: Guenther Deschner <gd@samba.org> |
14 |
|
|
Pair-Programmed-With: Guenther Deschner <gd@samba.org> |
15 |
|
|
Reviewed-by: Jeremy Allison <jra@samba.org> |
16 |
|
|
|
17 |
|
|
Autobuild-User(master): Volker Lendecke <vl@samba.org> |
18 |
|
|
Autobuild-Date(master): Thu Jun 15 17:32:45 CEST 2017 on sn-devel-144 |
19 |
|
|
|
20 |
|
|
(cherry picked from commit a4d9438ecf92614a0915b9cf61f905ea8170043a) |
21 |
|
|
--- |
22 |
|
|
libcli/smb/smbXcli_base.c | 15 +++++++++++++++ |
23 |
|
|
1 file changed, 15 insertions(+) |
24 |
|
|
|
25 |
|
|
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c |
26 |
|
|
index a7b24f01497..593edf9ce78 100644 |
27 |
|
|
--- a/libcli/smb/smbXcli_base.c |
28 |
|
|
+++ b/libcli/smb/smbXcli_base.c |
29 |
|
|
@@ -5321,6 +5321,21 @@ static void smb2cli_validate_negotiate_info_done(struct tevent_req *subreq) |
30 |
|
|
tevent_req_done(req); |
31 |
|
|
return; |
32 |
|
|
} |
33 |
|
|
+ if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) { |
34 |
|
|
+ /* |
35 |
|
|
+ * The response was signed, but not supported |
36 |
|
|
+ * |
37 |
|
|
+ * This might be returned by older Windows versions or by |
38 |
|
|
+ * NetApp SMB server implementations. |
39 |
|
|
+ * |
40 |
|
|
+ * See |
41 |
|
|
+ * |
42 |
|
|
+ * https://blogs.msdn.microsoft.com/openspecification/2012/06/28/smb3-secure-dialect-negotiation/ |
43 |
|
|
+ * |
44 |
|
|
+ */ |
45 |
|
|
+ tevent_req_done(req); |
46 |
|
|
+ return; |
47 |
|
|
+ } |
48 |
|
|
if (tevent_req_nterror(req, status)) { |
49 |
|
|
return; |
50 |
|
|
} |
51 |
|
|
-- |
52 |
|
|
2.13.1.518.g3df882009-goog |
53 |
|
|
|