aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/connect.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index e8c3e6b2af8a..a675b7f47d63 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -238,8 +238,8 @@ static const match_table_t cifs_mount_option_tokens = {
238enum { 238enum {
239 Opt_sec_krb5, Opt_sec_krb5i, Opt_sec_krb5p, 239 Opt_sec_krb5, Opt_sec_krb5i, Opt_sec_krb5p,
240 Opt_sec_ntlmsspi, Opt_sec_ntlmssp, 240 Opt_sec_ntlmsspi, Opt_sec_ntlmssp,
241 Opt_ntlm, Opt_sec_ntlmi, Opt_sec_ntlmv2i, 241 Opt_ntlm, Opt_sec_ntlmi, Opt_sec_ntlmv2,
242 Opt_sec_nontlm, Opt_sec_lanman, 242 Opt_sec_ntlmv2i, Opt_sec_lanman,
243 Opt_sec_none, 243 Opt_sec_none,
244 244
245 Opt_sec_err 245 Opt_sec_err
@@ -253,8 +253,9 @@ static const match_table_t cifs_secflavor_tokens = {
253 { Opt_sec_ntlmssp, "ntlmssp" }, 253 { Opt_sec_ntlmssp, "ntlmssp" },
254 { Opt_ntlm, "ntlm" }, 254 { Opt_ntlm, "ntlm" },
255 { Opt_sec_ntlmi, "ntlmi" }, 255 { Opt_sec_ntlmi, "ntlmi" },
256 { Opt_sec_ntlmv2, "nontlm" },
257 { Opt_sec_ntlmv2, "ntlmv2" },
256 { Opt_sec_ntlmv2i, "ntlmv2i" }, 258 { Opt_sec_ntlmv2i, "ntlmv2i" },
257 { Opt_sec_nontlm, "nontlm" },
258 { Opt_sec_lanman, "lanman" }, 259 { Opt_sec_lanman, "lanman" },
259 { Opt_sec_none, "none" }, 260 { Opt_sec_none, "none" },
260 261
@@ -1167,7 +1168,7 @@ static int cifs_parse_security_flavors(char *value,
1167 case Opt_sec_ntlmi: 1168 case Opt_sec_ntlmi:
1168 vol->secFlg |= CIFSSEC_MAY_NTLM | CIFSSEC_MUST_SIGN; 1169 vol->secFlg |= CIFSSEC_MAY_NTLM | CIFSSEC_MUST_SIGN;
1169 break; 1170 break;
1170 case Opt_sec_nontlm: 1171 case Opt_sec_ntlmv2:
1171 vol->secFlg |= CIFSSEC_MAY_NTLMV2; 1172 vol->secFlg |= CIFSSEC_MAY_NTLMV2;
1172 break; 1173 break;
1173 case Opt_sec_ntlmv2i: 1174 case Opt_sec_ntlmv2i: