diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2009-09-15 01:53:21 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-05 08:27:51 -0700 |
| commit | cb2a1b63162335f8a693fcbd6317e23b675a1970 (patch) | |
| tree | 0c80f61f3fe14825b21c363a52bcfbb3c940c228 | |
| parent | 1c3a00c887a2942679b96676dc3294685e5860c9 (diff) | |
| download | linux-stable-cb2a1b63162335f8a693fcbd6317e23b675a1970.tar.gz linux-stable-cb2a1b63162335f8a693fcbd6317e23b675a1970.tar.bz2 linux-stable-cb2a1b63162335f8a693fcbd6317e23b675a1970.zip | |
Re-enable Lanman security
commit 20d1752f3d6bd32beb90949559e0d14a0b234445 upstream.
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.
Signed-off-by: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | fs/cifs/cifsglob.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index a61ab772c6f6..115036f9ccf4 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -544,9 +544,9 @@ require use of the stronger protocol */ #define CIFSSEC_MUST_LANMAN 0x10010 #define CIFSSEC_MUST_PLNTXT 0x20020 #ifdef CONFIG_CIFS_UPCALL -#define CIFSSEC_MASK 0xAF0AF /* allows weak security but also krb5 */ +#define CIFSSEC_MASK 0xBF0BF /* allows weak security but also krb5 */ #else -#define CIFSSEC_MASK 0xA70A7 /* current flags supported if weak */ +#define CIFSSEC_MASK 0xB70B7 /* current flags supported if weak */ #endif /* UPCALL */ #else /* do not allow weak pw hash */ #ifdef CONFIG_CIFS_UPCALL |