From patchwork Tue Jul 24 00:34:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1229571 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 4C12FDFFB5 for ; Tue, 24 Jul 2012 00:34:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754845Ab2GXAeY (ORCPT ); Mon, 23 Jul 2012 20:34:24 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:49405 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754843Ab2GXAeY (ORCPT ); Mon, 23 Jul 2012 20:34:24 -0400 Received: by yhmm54 with SMTP id m54so6127918yhm.19 for ; Mon, 23 Jul 2012 17:34:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding:x-gm-message-state; bh=x2PM8rO76EEDoCipX8ycWrqBeFGjepl0u7yH9oVFj7c=; b=KHkA8ciBXQiHQR6MX1a3mUWPSlF3ztffWImwvopfyvIyQg/2oEhiUjdaYMxfR7n21e Cnq0XOoTG9wwuSobisiZlXIJx8TGtZoIVd611zeEfXB+Lvn2zCdlAbbtdmEe0MXfKmLE RQip+Uds2aDUTaBor60D/XtPPJ3s+4jUVlUiiwpmEy9pZn2Ze11wT4IDSyUf6clZchz7 eThCENUoQObVP/Xyv1SMo6MlACeHfvtwZyHI8c+f2aDdQ9aiyHnzBLTaxr3gc8N+6Swd 2IXUtbhPFb7CEo3lZKvIZ3Ey6HB0V008JXQAz5hLzFFWFmqdc7p4mAIl346u2zPA1qeD m+cA== Received: by 10.236.72.70 with SMTP id s46mr16369455yhd.108.1343090063425; Mon, 23 Jul 2012 17:34:23 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-076-182-054-194.nc.res.rr.com. [76.182.54.194]) by mx.google.com with ESMTPS id i34sm13982035anm.12.2012.07.23.17.34.22 (version=SSLv3 cipher=OTHER); Mon, 23 Jul 2012 17:34:22 -0700 (PDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org, linux@kukkukk.com, sprabhu@redhat.com Subject: [PATCH] cifs: reinstate sec=ntlmv2 mount option Date: Mon, 23 Jul 2012 20:34:17 -0400 Message-Id: <1343090057-32700-1-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkDcFOOZPuvnucuh/7AIqngMS97zkhc4aOnhEroXRjPz45poUu4Aveep0dRaqK2st6pTN79 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org sec=ntlmv2 as a mount option got dropped in the mount option overhaul. Cc: Sachin Prabhu Cc: # 3.4+ Reported-by: Günter Kukkukk Signed-off-by: Jeff Layton ACKed-by: Sachin Prabhu --- 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: