summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-07-13 13:00:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-07-13 13:00:25 -0700
commitd0d0cd38005518533d641e1344537f89cfe95203 (patch)
tree72e7bd6cbe89a17e862da9ef17dad9beb0b6893e /fs
parent528dd46d0fc35c0176257a13a27d41e44fcc6cb3 (diff)
parentd2346e2836318a227057ed41061114cbebee5d2a (diff)
downloadlinux-d0d0cd38005518533d641e1344537f89cfe95203.tar.gz
linux-d0d0cd38005518533d641e1344537f89cfe95203.tar.bz2
linux-d0d0cd38005518533d641e1344537f89cfe95203.zip
Merge tag '6.10-rc7-smb3-client-fix' of git://git.samba.org/sfrench/cifs-2.6
Pull smb client fix from Steve French: "Small fix, also for stable" * tag '6.10-rc7-smb3-client-fix' of git://git.samba.org/sfrench/cifs-2.6: cifs: fix setting SecurityFlags to true
Diffstat (limited to 'fs')
-rw-r--r--fs/smb/client/cifsglob.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h
index 557b68e99d0a..a865941724c0 100644
--- a/fs/smb/client/cifsglob.h
+++ b/fs/smb/client/cifsglob.h
@@ -1918,8 +1918,8 @@ require use of the stronger protocol */
#define CIFSSEC_MUST_SEAL 0x40040 /* not supported yet */
#define CIFSSEC_MUST_NTLMSSP 0x80080 /* raw ntlmssp with ntlmv2 */
-#define CIFSSEC_DEF (CIFSSEC_MAY_SIGN | CIFSSEC_MAY_NTLMV2 | CIFSSEC_MAY_NTLMSSP)
-#define CIFSSEC_MAX (CIFSSEC_MUST_NTLMV2)
+#define CIFSSEC_DEF (CIFSSEC_MAY_SIGN | CIFSSEC_MAY_NTLMV2 | CIFSSEC_MAY_NTLMSSP | CIFSSEC_MAY_SEAL)
+#define CIFSSEC_MAX (CIFSSEC_MAY_SIGN | CIFSSEC_MUST_KRB5 | CIFSSEC_MAY_SEAL)
#define CIFSSEC_AUTH_MASK (CIFSSEC_MAY_NTLMV2 | CIFSSEC_MAY_KRB5 | CIFSSEC_MAY_NTLMSSP)
/*
*****************************************************************