From patchwork Thu Sep 2 01:37:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 148071 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o821bbxK005002 for ; Thu, 2 Sep 2010 01:46:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755025Ab0IBBix (ORCPT ); Wed, 1 Sep 2010 21:38:53 -0400 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.120]:62421 "EHLO cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752582Ab0IBBiw (ORCPT ); Wed, 1 Sep 2010 21:38:52 -0400 X-Authority-Analysis: v=1.1 cv=CjIrh0z8wN5M7DYqe8Bxtxzw6M45hYlnllSU75Z2ugA= c=1 sm=0 a=xABbsU4gRrwA:10 a=ld/erqUjW76FpBUqCqkKeA==:17 a=i5rasONfh2jUFp8FLdUA:9 a=5N2MJXXXAPvPQIOzkmU60FUCVb4A:4 a=ld/erqUjW76FpBUqCqkKeA==:117 X-Cloudmark-Score: 0 X-Originating-IP: 71.70.153.3 Received: from [71.70.153.3] ([71.70.153.3:45518] helo=mail.poochiereds.net) by cdptpa-oedge03.mail.rr.com (envelope-from ) (ecelerity 2.2.2.39 r()) with ESMTP id E1/E9-23480-FDFFE7C4; Thu, 02 Sep 2010 01:37:36 +0000 Received: by mail.poochiereds.net (Postfix, from userid 4447) id 8157B58162; Wed, 1 Sep 2010 21:37:35 -0400 (EDT) From: Jeff Layton To: smfrench@gmail.com Cc: shirishpargaonkar@gmail.com, linux-cifs@vger.kernel.org Subject: [PATCH 2/6] Revert "cifs: revert needless change in decode_negTokenInit" Date: Wed, 1 Sep 2010 21:37:31 -0400 Message-Id: <1283391455-6848-3-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.2.2 In-Reply-To: <1283391455-6848-1-git-send-email-jlayton@redhat.com> References: <1283391455-6848-1-git-send-email-jlayton@redhat.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 02 Sep 2010 01:46:17 +0000 (UTC) diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c index cfd1ce3..21f0fbd 100644 --- a/fs/cifs/asn1.c +++ b/fs/cifs/asn1.c @@ -597,13 +597,13 @@ decode_negTokenInit(unsigned char *security_blob, int length, if (compare_oid(oid, oidlen, MSKRB5_OID, MSKRB5_OID_LEN)) server->sec_mskerberos = true; - else if (compare_oid(oid, oidlen, KRB5U2U_OID, + if (compare_oid(oid, oidlen, KRB5U2U_OID, KRB5U2U_OID_LEN)) server->sec_kerberosu2u = true; - else if (compare_oid(oid, oidlen, KRB5_OID, + if (compare_oid(oid, oidlen, KRB5_OID, KRB5_OID_LEN)) server->sec_kerberos = true; - else if (compare_oid(oid, oidlen, NTLMSSP_OID, + if (compare_oid(oid, oidlen, NTLMSSP_OID, NTLMSSP_OID_LEN)) server->sec_ntlmssp = true;