diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-17 18:49:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-17 18:49:21 -0700 |
| commit | 04919afb85c8f007b7326c4da5eb61c52e91b9c7 (patch) | |
| tree | 005e9dd8da59d4141d2e99570f4298624c692e90 /fs/cifs/sess.c | |
| parent | 83f11a9cf2578b104c0daf18fc9c7d33c3d6d53a (diff) | |
| parent | 0c26606cbe4937f2228a27bb0c2cad19855be87a (diff) | |
| download | op-kernel-dev-04919afb85c8f007b7326c4da5eb61c52e91b9c7.zip op-kernel-dev-04919afb85c8f007b7326c4da5eb61c52e91b9c7.tar.gz | |
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French:
"Five small cifs fixes (includes fixes for: unmount hang, 2 security
related, symlink, large file writes)"
* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
cifs: ntstatus_to_dos_map[] is not terminated
cifs: Allow LANMAN auth method for servers supporting unencapsulated authentication methods
cifs: Fix inability to write files >2GB to SMB2/3 shares
cifs: Avoid umount hangs with smb2 when server is unresponsive
do not treat non-symlink reparse points as valid symlinks
Diffstat (limited to 'fs/cifs/sess.c')
| -rw-r--r-- | fs/cifs/sess.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index 352358d..e87387d 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -500,9 +500,9 @@ select_sectype(struct TCP_Server_Info *server, enum securityEnum requested) return NTLMv2; if (global_secflags & CIFSSEC_MAY_NTLM) return NTLM; - /* Fallthrough */ default: - return Unspecified; + /* Fallthrough to attempt LANMAN authentication next */ + break; } case CIFS_NEGFLAVOR_LANMAN: switch (requested) { |
