From patchwork Thu Mar 3 00:51:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Coffman X-Patchwork-Id: 604551 X-Patchwork-Delegate: Trond.Myklebust@netapp.com 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 p230xHqM016803 for ; Thu, 3 Mar 2011 00:59:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754634Ab1CCA7Q (ORCPT ); Wed, 2 Mar 2011 19:59:16 -0500 Received: from citi.umich.edu ([141.212.112.111]:55878 "EHLO citi.umich.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754413Ab1CCA7P (ORCPT ); Wed, 2 Mar 2011 19:59:15 -0500 Received: from jazz.citi.umich.edu (jazz.citi.umich.edu [141.212.112.62]) by citi.umich.edu (Postfix) with ESMTP id 9CA7C18099; Wed, 2 Mar 2011 19:51:50 -0500 (EST) From: Kevin Coffman To: "J. Bruce Fields" Cc: , Kevin Coffman Subject: [PATCH 1/2] gss:krb5 only include enctype numbers in gm_upcall_enctypes Date: Wed, 2 Mar 2011 19:51:41 -0500 Message-Id: <1299113502-17179-2-git-send-email-kwc@citi.umich.edu> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1299113502-17179-1-git-send-email-kwc@citi.umich.edu> References: <1299113502-17179-1-git-send-email-kwc@citi.umich.edu> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 03 Mar 2011 00:59:18 +0000 (UTC) diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 45dbf15..f3914d0 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -417,7 +417,7 @@ static void gss_encode_v1_msg(struct gss_upcall_msg *gss_msg, gss_msg->msg.len += len; } if (mech->gm_upcall_enctypes) { - len = sprintf(p, mech->gm_upcall_enctypes); + len = sprintf(p, "enctypes=%s ", mech->gm_upcall_enctypes); p += len; gss_msg->msg.len += len; } diff --git a/net/sunrpc/auth_gss/gss_krb5_mech.c b/net/sunrpc/auth_gss/gss_krb5_mech.c index f375dec..9022f0a 100644 --- a/net/sunrpc/auth_gss/gss_krb5_mech.c +++ b/net/sunrpc/auth_gss/gss_krb5_mech.c @@ -750,7 +750,7 @@ static struct gss_api_mech gss_kerberos_mech = { .gm_ops = &gss_kerberos_ops, .gm_pf_num = ARRAY_SIZE(gss_kerberos_pfs), .gm_pfs = gss_kerberos_pfs, - .gm_upcall_enctypes = "enctypes=18,17,16,23,3,1,2 ", + .gm_upcall_enctypes = "18,17,16,23,3,1,2", }; static int __init init_kerberos_module(void)