* [PATCH] cifs: reinstate sec=ntlmv2 mount option
@ 2012-07-24 0:34 Jeff Layton
[not found] ` <1343090057-32700-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Layton @ 2012-07-24 0:34 UTC (permalink / raw)
To: smfrench-Re5JQEeQqe8AvxtiuMwx3w
Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA, linux-KQewbsS9MvBBDgjK7y7TUQ,
sprabhu-H+wXaHxf7aLQT0dZR+AlfA
sec=ntlmv2 as a mount option got dropped in the mount option overhaul.
Cc: Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # 3.4+
Reported-by: Günter Kukkukk <linux-KQewbsS9MvBBDgjK7y7TUQ@public.gmane.org>
Signed-off-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
fs/cifs/connect.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index e8c3e6b..a675b7f 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -238,8 +238,8 @@ static const match_table_t cifs_mount_option_tokens = {
enum {
Opt_sec_krb5, Opt_sec_krb5i, Opt_sec_krb5p,
Opt_sec_ntlmsspi, Opt_sec_ntlmssp,
- Opt_ntlm, Opt_sec_ntlmi, Opt_sec_ntlmv2i,
- Opt_sec_nontlm, Opt_sec_lanman,
+ Opt_ntlm, Opt_sec_ntlmi, Opt_sec_ntlmv2,
+ Opt_sec_ntlmv2i, Opt_sec_lanman,
Opt_sec_none,
Opt_sec_err
@@ -253,8 +253,9 @@ static const match_table_t cifs_secflavor_tokens = {
{ Opt_sec_ntlmssp, "ntlmssp" },
{ Opt_ntlm, "ntlm" },
{ Opt_sec_ntlmi, "ntlmi" },
+ { Opt_sec_ntlmv2, "nontlm" },
+ { Opt_sec_ntlmv2, "ntlmv2" },
{ Opt_sec_ntlmv2i, "ntlmv2i" },
- { Opt_sec_nontlm, "nontlm" },
{ Opt_sec_lanman, "lanman" },
{ Opt_sec_none, "none" },
@@ -1167,7 +1168,7 @@ static int cifs_parse_security_flavors(char *value,
case Opt_sec_ntlmi:
vol->secFlg |= CIFSSEC_MAY_NTLM | CIFSSEC_MUST_SIGN;
break;
- case Opt_sec_nontlm:
+ case Opt_sec_ntlmv2:
vol->secFlg |= CIFSSEC_MAY_NTLMV2;
break;
case Opt_sec_ntlmv2i:
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] cifs: reinstate sec=ntlmv2 mount option
[not found] ` <1343090057-32700-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2012-07-24 1:47 ` Steve French
[not found] ` <CAH2r5mt=ZcO7pPodj++oNRkNrnZum=FBAE0RxoyyWVSsi2KqFQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-07-24 9:18 ` Sachin Prabhu
1 sibling, 1 reply; 4+ messages in thread
From: Steve French @ 2012-07-24 1:47 UTC (permalink / raw)
To: Jeff Layton
Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA, linux-KQewbsS9MvBBDgjK7y7TUQ,
sprabhu-H+wXaHxf7aLQT0dZR+AlfA
probably could alias this (sec=ntlmv2) in mount.cifs as well if we
need a fast fix without kernel update.
On Mon, Jul 23, 2012 at 7:34 PM, Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> sec=ntlmv2 as a mount option got dropped in the mount option overhaul.
>
> Cc: Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # 3.4+
> Reported-by: Günter Kukkukk <linux-KQewbsS9MvBBDgjK7y7TUQ@public.gmane.org>
> Signed-off-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
> fs/cifs/connect.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index e8c3e6b..a675b7f 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -238,8 +238,8 @@ static const match_table_t cifs_mount_option_tokens = {
> enum {
> Opt_sec_krb5, Opt_sec_krb5i, Opt_sec_krb5p,
> Opt_sec_ntlmsspi, Opt_sec_ntlmssp,
> - Opt_ntlm, Opt_sec_ntlmi, Opt_sec_ntlmv2i,
> - Opt_sec_nontlm, Opt_sec_lanman,
> + Opt_ntlm, Opt_sec_ntlmi, Opt_sec_ntlmv2,
> + Opt_sec_ntlmv2i, Opt_sec_lanman,
> Opt_sec_none,
>
> Opt_sec_err
> @@ -253,8 +253,9 @@ static const match_table_t cifs_secflavor_tokens = {
> { Opt_sec_ntlmssp, "ntlmssp" },
> { Opt_ntlm, "ntlm" },
> { Opt_sec_ntlmi, "ntlmi" },
> + { Opt_sec_ntlmv2, "nontlm" },
> + { Opt_sec_ntlmv2, "ntlmv2" },
> { Opt_sec_ntlmv2i, "ntlmv2i" },
> - { Opt_sec_nontlm, "nontlm" },
> { Opt_sec_lanman, "lanman" },
> { Opt_sec_none, "none" },
>
> @@ -1167,7 +1168,7 @@ static int cifs_parse_security_flavors(char *value,
> case Opt_sec_ntlmi:
> vol->secFlg |= CIFSSEC_MAY_NTLM | CIFSSEC_MUST_SIGN;
> break;
> - case Opt_sec_nontlm:
> + case Opt_sec_ntlmv2:
> vol->secFlg |= CIFSSEC_MAY_NTLMV2;
> break;
> case Opt_sec_ntlmv2i:
> --
> 1.7.10.4
>
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] cifs: reinstate sec=ntlmv2 mount option
[not found] ` <CAH2r5mt=ZcO7pPodj++oNRkNrnZum=FBAE0RxoyyWVSsi2KqFQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2012-07-24 2:35 ` Günter Kukkukk
0 siblings, 0 replies; 4+ messages in thread
From: Günter Kukkukk @ 2012-07-24 2:35 UTC (permalink / raw)
To: Steve French
Cc: Jeff Layton, linux-cifs-u79uwXL29TY76Z2rM5mHXA,
sprabhu-H+wXaHxf7aLQT0dZR+AlfA
Am Dienstag, 24. Juli 2012, 03:47:30 schrieb Steve French:
> probably could alias this (sec=ntlmv2) in mount.cifs as well if we
> need a fast fix without kernel update.
>
> On Mon, Jul 23, 2012 at 7:34 PM, Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> > sec=ntlmv2 as a mount option got dropped in the mount option overhaul.
> >
> > Cc: Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # 3.4+
> > Reported-by: Günter Kukkukk <linux-KQewbsS9MvBBDgjK7y7TUQ@public.gmane.org>
> > Signed-off-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > ---
> >
> > fs/cifs/connect.c | 9 +++++----
> > 1 file changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> > index e8c3e6b..a675b7f 100644
> > --- a/fs/cifs/connect.c
> > +++ b/fs/cifs/connect.c
> > @@ -238,8 +238,8 @@ static const match_table_t cifs_mount_option_tokens =
> > {
> >
> > enum {
> >
> > Opt_sec_krb5, Opt_sec_krb5i, Opt_sec_krb5p,
> > Opt_sec_ntlmsspi, Opt_sec_ntlmssp,
> >
> > - Opt_ntlm, Opt_sec_ntlmi, Opt_sec_ntlmv2i,
> > - Opt_sec_nontlm, Opt_sec_lanman,
> > + Opt_ntlm, Opt_sec_ntlmi, Opt_sec_ntlmv2,
> > + Opt_sec_ntlmv2i, Opt_sec_lanman,
> >
> > Opt_sec_none,
> >
> > Opt_sec_err
> >
> > @@ -253,8 +253,9 @@ static const match_table_t cifs_secflavor_tokens = {
> >
> > { Opt_sec_ntlmssp, "ntlmssp" },
> > { Opt_ntlm, "ntlm" },
> > { Opt_sec_ntlmi, "ntlmi" },
> >
> > + { Opt_sec_ntlmv2, "nontlm" },
> > + { Opt_sec_ntlmv2, "ntlmv2" },
> >
> > { Opt_sec_ntlmv2i, "ntlmv2i" },
> >
> > - { Opt_sec_nontlm, "nontlm" },
> >
> > { Opt_sec_lanman, "lanman" },
> > { Opt_sec_none, "none" },
> >
> > @@ -1167,7 +1168,7 @@ static int cifs_parse_security_flavors(char *value,
> >
> > case Opt_sec_ntlmi:
> > vol->secFlg |= CIFSSEC_MAY_NTLM | CIFSSEC_MUST_SIGN;
> > break;
> >
> > - case Opt_sec_nontlm:
> >
> > + case Opt_sec_ntlmv2:
> > vol->secFlg |= CIFSSEC_MAY_NTLMV2;
> > break;
> >
> > case Opt_sec_ntlmv2i:
> > --
> > 1.7.10.4
on IRC Jeff already mentioned "sec=nontlm" as a current workaround.
The complaining user (not being able to use sec=ntlmv2) reported
success using that workaround (obviously).
So i think, mount.cifs should never ever been overloaded with
another alias.
Cheers, Günter
Btw - how is the "man" page updated at
http://www.samba.org/samba/docs/man/manpages-3/mount.cifs.8.html
seems to be not uptodate
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] cifs: reinstate sec=ntlmv2 mount option
[not found] ` <1343090057-32700-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2012-07-24 1:47 ` Steve French
@ 2012-07-24 9:18 ` Sachin Prabhu
1 sibling, 0 replies; 4+ messages in thread
From: Sachin Prabhu @ 2012-07-24 9:18 UTC (permalink / raw)
To: Jeff Layton
Cc: smfrench-Re5JQEeQqe8AvxtiuMwx3w,
linux-cifs-u79uwXL29TY76Z2rM5mHXA, linux-KQewbsS9MvBBDgjK7y7TUQ
On Mon, 2012-07-23 at 20:34 -0400, Jeff Layton wrote:
> sec=ntlmv2 as a mount option got dropped in the mount option overhaul.
>
> Cc: Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # 3.4+
> Reported-by: Günter Kukkukk <linux-KQewbsS9MvBBDgjK7y7TUQ@public.gmane.org>
> Signed-off-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
> fs/cifs/connect.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index e8c3e6b..a675b7f 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -238,8 +238,8 @@ static const match_table_t cifs_mount_option_tokens = {
> enum {
> Opt_sec_krb5, Opt_sec_krb5i, Opt_sec_krb5p,
> Opt_sec_ntlmsspi, Opt_sec_ntlmssp,
> - Opt_ntlm, Opt_sec_ntlmi, Opt_sec_ntlmv2i,
> - Opt_sec_nontlm, Opt_sec_lanman,
> + Opt_ntlm, Opt_sec_ntlmi, Opt_sec_ntlmv2,
> + Opt_sec_ntlmv2i, Opt_sec_lanman,
> Opt_sec_none,
>
> Opt_sec_err
> @@ -253,8 +253,9 @@ static const match_table_t cifs_secflavor_tokens = {
> { Opt_sec_ntlmssp, "ntlmssp" },
> { Opt_ntlm, "ntlm" },
> { Opt_sec_ntlmi, "ntlmi" },
> + { Opt_sec_ntlmv2, "nontlm" },
> + { Opt_sec_ntlmv2, "ntlmv2" },
> { Opt_sec_ntlmv2i, "ntlmv2i" },
> - { Opt_sec_nontlm, "nontlm" },
> { Opt_sec_lanman, "lanman" },
> { Opt_sec_none, "none" },
>
> @@ -1167,7 +1168,7 @@ static int cifs_parse_security_flavors(char *value,
> case Opt_sec_ntlmi:
> vol->secFlg |= CIFSSEC_MAY_NTLM | CIFSSEC_MUST_SIGN;
> break;
> - case Opt_sec_nontlm:
> + case Opt_sec_ntlmv2:
> vol->secFlg |= CIFSSEC_MAY_NTLMV2;
> break;
> case Opt_sec_ntlmv2i:
ACKed-by: Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-24 9:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-24 0:34 [PATCH] cifs: reinstate sec=ntlmv2 mount option Jeff Layton
[not found] ` <1343090057-32700-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2012-07-24 1:47 ` Steve French
[not found] ` <CAH2r5mt=ZcO7pPodj++oNRkNrnZum=FBAE0RxoyyWVSsi2KqFQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-07-24 2:35 ` Günter Kukkukk
2012-07-24 9:18 ` Sachin Prabhu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.