Merge remote-tracking branch 'origin/next'

[ipfire-2.x.git] / src / patches / samba / samba-3.6.99-2110-ntlmssp-session-setup-nas.patch

diff --git a/src/patches/samba/samba-3.6.99-2110-ntlmssp-session-setup-nas.patch b/src/patches/samba/samba-3.6.99-2110-ntlmssp-session-setup-nas.patch
deleted file mode 100644 (file)
index 2b6ce6a..0000000
--- a/src/patches/samba/samba-3.6.99-2110-ntlmssp-session-setup-nas.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ce2b7dad823e3af00884bc0c75851eec7445ec88 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Mon, 31 Oct 2016 12:25:35 +0100
-Subject: [PATCH] s3-libsmb Allow SESSION KEY setup without signing
-
-This is not supported by NetApp or EMC NAS systems. They do not
-implement the protocol correctly. So work around their broken
-implementations.
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
----
- source3/libsmb/ntlmssp.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
-index 7e58990..446d02d 100644
---- a/source3/libsmb/ntlmssp.c
-+++ b/source3/libsmb/ntlmssp.c
-@@ -206,7 +206,7 @@ void ntlmssp_want_feature_list(struct ntlmssp_state *ntlmssp_state, char *featur
-        * also add  NTLMSSP_NEGOTIATE_SEAL here. JRA.
-        */
-       if (in_list("NTLMSSP_FEATURE_SESSION_KEY", feature_list, True)) {
--              ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SIGN;
-+              ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
-       }
-       if (in_list("NTLMSSP_FEATURE_SIGN", feature_list, True)) {
-               ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SIGN;
-@@ -231,7 +231,7 @@ void ntlmssp_want_feature(struct ntlmssp_state *ntlmssp_state, uint32_t feature)
- {
-       /* As per JRA's comment above */
-       if (feature & NTLMSSP_FEATURE_SESSION_KEY) {
--              ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SIGN;
-+              ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
-       }
-       if (feature & NTLMSSP_FEATURE_SIGN) {
-               ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SIGN;
--- 
-2.10.1
-