aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2009-09-15 01:53:21 -0400
committerSteve French <sfrench@us.ibm.com>2009-09-15 15:38:05 -0400
commit20d1752f3d6bd32beb90949559e0d14a0b234445 (patch)
tree4c3c4370b8ad18e07339b4f9e53d35c6df049512 /fs/cifs
parent4142e0d1def2c0176c27fd2e810243045a62eb6d (diff)
[CIFS] Re-enable Lanman security
commit ac68392460ffefed13020967bae04edc4d3add06 ("[CIFS] Allow raw ntlmssp code to be enabled with sec=ntlmssp") added a new bit to the allowed security flags mask but seems to have inadvertently removed Lanman security from the allowed flags. Add it back. CC: Stable <stable@kernel.org> Signed-off-by: Chuck Ebbert <cebbert@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/cifsglob.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 6cfc81a32703..a03482298ed9 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -585,9 +585,9 @@ require use of the stronger protocol */
585#define CIFSSEC_MUST_LANMAN 0x10010 585#define CIFSSEC_MUST_LANMAN 0x10010
586#define CIFSSEC_MUST_PLNTXT 0x20020 586#define CIFSSEC_MUST_PLNTXT 0x20020
587#ifdef CONFIG_CIFS_UPCALL 587#ifdef CONFIG_CIFS_UPCALL
588#define CIFSSEC_MASK 0xAF0AF /* allows weak security but also krb5 */ 588#define CIFSSEC_MASK 0xBF0BF /* allows weak security but also krb5 */
589#else 589#else
590#define CIFSSEC_MASK 0xA70A7 /* current flags supported if weak */ 590#define CIFSSEC_MASK 0xB70B7 /* current flags supported if weak */
591#endif /* UPCALL */ 591#endif /* UPCALL */
592#else /* do not allow weak pw hash */ 592#else /* do not allow weak pw hash */
593#ifdef CONFIG_CIFS_UPCALL 593#ifdef CONFIG_CIFS_UPCALL