Commit 7659624f authored by Jeff Layton's avatar Jeff Layton Committed by Steve French

cifs: reinstate sec=ntlmv2 mount option

sec=ntlmv2 as a mount option got dropped in the mount option overhaul.

Cc: Sachin Prabhu <sprabhu@redhat.com>
Cc: <stable@vger.kernel.org> # 3.4+
Reported-by: default avatarGünter Kukkukk <linux@kukkukk.com>
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 762a4206
...@@ -238,8 +238,8 @@ static const match_table_t cifs_mount_option_tokens = { ...@@ -238,8 +238,8 @@ static const match_table_t cifs_mount_option_tokens = {
enum { enum {
Opt_sec_krb5, Opt_sec_krb5i, Opt_sec_krb5p, Opt_sec_krb5, Opt_sec_krb5i, Opt_sec_krb5p,
Opt_sec_ntlmsspi, Opt_sec_ntlmssp, Opt_sec_ntlmsspi, Opt_sec_ntlmssp,
Opt_ntlm, Opt_sec_ntlmi, Opt_sec_ntlmv2i, Opt_ntlm, Opt_sec_ntlmi, Opt_sec_ntlmv2,
Opt_sec_nontlm, Opt_sec_lanman, Opt_sec_ntlmv2i, Opt_sec_lanman,
Opt_sec_none, Opt_sec_none,
Opt_sec_err Opt_sec_err
...@@ -253,8 +253,9 @@ static const match_table_t cifs_secflavor_tokens = { ...@@ -253,8 +253,9 @@ static const match_table_t cifs_secflavor_tokens = {
{ Opt_sec_ntlmssp, "ntlmssp" }, { Opt_sec_ntlmssp, "ntlmssp" },
{ Opt_ntlm, "ntlm" }, { Opt_ntlm, "ntlm" },
{ Opt_sec_ntlmi, "ntlmi" }, { Opt_sec_ntlmi, "ntlmi" },
{ Opt_sec_ntlmv2, "nontlm" },
{ Opt_sec_ntlmv2, "ntlmv2" },
{ Opt_sec_ntlmv2i, "ntlmv2i" }, { Opt_sec_ntlmv2i, "ntlmv2i" },
{ Opt_sec_nontlm, "nontlm" },
{ Opt_sec_lanman, "lanman" }, { Opt_sec_lanman, "lanman" },
{ Opt_sec_none, "none" }, { Opt_sec_none, "none" },
...@@ -1167,7 +1168,7 @@ static int cifs_parse_security_flavors(char *value, ...@@ -1167,7 +1168,7 @@ static int cifs_parse_security_flavors(char *value,
case Opt_sec_ntlmi: case Opt_sec_ntlmi:
vol->secFlg |= CIFSSEC_MAY_NTLM | CIFSSEC_MUST_SIGN; vol->secFlg |= CIFSSEC_MAY_NTLM | CIFSSEC_MUST_SIGN;
break; break;
case Opt_sec_nontlm: case Opt_sec_ntlmv2:
vol->secFlg |= CIFSSEC_MAY_NTLMV2; vol->secFlg |= CIFSSEC_MAY_NTLMV2;
break; break;
case Opt_sec_ntlmv2i: case Opt_sec_ntlmv2i:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment