lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 051/109] cifs: reinstate sec=ntlmv2 mount option
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.4-stable review patch. If anyone has any objections, please let me know.

    ------------------

    From: Jeff Layton <jlayton@redhat.com>

    commit 7659624ffb550d69c87f9af9ae63e717daa874bd upstream.

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

    Cc: Sachin Prabhu <sprabhu@redhat.com>
    Reported-by: Günter Kukkukk <linux@kukkukk.com>
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <smfrench@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/cifs/connect.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/fs/cifs/connect.c
    +++ b/fs/cifs/connect.c
    @@ -238,8 +238,8 @@ static const match_table_t cifs_mount_op
    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_secflavo
    { 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" },

    @@ -1163,7 +1164,7 @@ static int cifs_parse_security_flavors(c
    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:

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-08-08 02:01    [W:0.038 / U:29.500 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site