From patchwork Mon Aug 30 13:05:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 142421 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 o7UD5R0L028711 for ; Mon, 30 Aug 2010 13:05:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755067Ab0H3NF1 (ORCPT ); Mon, 30 Aug 2010 09:05:27 -0400 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.122]:33178 "EHLO cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755016Ab0H3NF0 (ORCPT ); Mon, 30 Aug 2010 09:05:26 -0400 X-Authority-Analysis: v=1.1 cv=brSWV/nI9cz3S+sn23mYBIrWcHbye1JY4VGmRNM8jk8= c=1 sm=0 a=nyNQrzubh-IA:10 a=ld/erqUjW76FpBUqCqkKeA==:17 a=pGLkceISAAAA:8 a=20KFwNOVAAAA:8 a=99MH_ouohzWxd31B6ZUA:9 a=2fJ-iYAbhR7JNpq9UlQA:7 a=DVTAoUtL6BGgpavsF3NBjrJOkfUA:4 a=MSl-tDqOz04A:10 a=jEp0ucaQiEUA:10 a=O3I-iJsvggfUH5DM:21 a=z_2nGB1d3vM4Wuxt:21 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:41979] helo=mail.poochiereds.net) by cdptpa-oedge04.mail.rr.com (envelope-from ) (ecelerity 2.2.2.39 r()) with ESMTP id 16/CE-13320-49CAB7C4; Mon, 30 Aug 2010 13:05:25 +0000 Received: by mail.poochiereds.net (Postfix, from userid 4447) id 985C958162; Mon, 30 Aug 2010 09:05:24 -0400 (EDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org, shirishpargaonkar@gmail.com Subject: [PATCH] cifs: revert needless change in decode_negTokenInit Date: Mon, 30 Aug 2010 09:05:24 -0400 Message-Id: <1283173524-31920-1-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.2.2 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]); Mon, 30 Aug 2010 13:05:28 +0000 (UTC) diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c index 21f0fbd..cfd1ce3 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; - if (compare_oid(oid, oidlen, KRB5U2U_OID, + else if (compare_oid(oid, oidlen, KRB5U2U_OID, KRB5U2U_OID_LEN)) server->sec_kerberosu2u = true; - if (compare_oid(oid, oidlen, KRB5_OID, + else if (compare_oid(oid, oidlen, KRB5_OID, KRB5_OID_LEN)) server->sec_kerberos = true; - if (compare_oid(oid, oidlen, NTLMSSP_OID, + else if (compare_oid(oid, oidlen, NTLMSSP_OID, NTLMSSP_OID_LEN)) server->sec_ntlmssp = true;