diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-09 22:53:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-09 22:53:11 -0400 |
| commit | 65112dccf8a113737684366349d7f9ec373ddc47 (patch) | |
| tree | 4aaaffb4cfd48954ba8e0c174a2a963ad012295a /fs | |
| parent | bbf5e9743fd6c9b4ef8a34db8a9502baf4191524 (diff) | |
| parent | 9d1e397b7bafe843564eab26ed3f682637159c6c (diff) | |
Merge git://git.samba.org/sfrench/cifs-2.6
* git://git.samba.org/sfrench/cifs-2.6:
[CIFS] Fix first time message on mount, ntlmv2 upgrade delayed to 3.2
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/connect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index f4af4cc37500..71beb0201970 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -2018,7 +2018,7 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info) | |||
| 2018 | warned_on_ntlm = true; | 2018 | warned_on_ntlm = true; |
| 2019 | cERROR(1, "default security mechanism requested. The default " | 2019 | cERROR(1, "default security mechanism requested. The default " |
| 2020 | "security mechanism will be upgraded from ntlm to " | 2020 | "security mechanism will be upgraded from ntlm to " |
| 2021 | "ntlmv2 in kernel release 3.1"); | 2021 | "ntlmv2 in kernel release 3.2"); |
| 2022 | } | 2022 | } |
| 2023 | ses->overrideSecFlg = volume_info->secFlg; | 2023 | ses->overrideSecFlg = volume_info->secFlg; |
| 2024 | 2024 | ||