From bfields@fieldses.org Wed Jun 16 02:03:36 2004 Return-Path: Received: from mail-imap3.uio.no ([unix socket]) by mail-imap3.uio.no (Cyrus v2.1.11) with LMTP; Wed, 16 Jun 2004 02:03:36 +0200 X-Sieve: CMU Sieve 2.2 Delivery-date: Wed, 16 Jun 2004 02:03:36 +0200 Received: from mail-mx2.uio.no ([129.240.10.30]) by mail-imap3.uio.no with esmtp (Exim 4.34) id 1BaNtw-0003Ij-A8 for trond.myklebust@fys.uio.no; Wed, 16 Jun 2004 02:03:36 +0200 Received: from dsl093-002-214.det1.dsl.speakeasy.net ([66.93.2.214] helo=pickle.fieldses.org) by smtp.uio.no with esmtp (TLSv1:RC4-SHA:128) (Exim 4.34) id 1BaNts-0006Q4-Ej for trond.myklebust@fys.uio.no; Wed, 16 Jun 2004 02:03:32 +0200 Received: from bfields by pickle.fieldses.org with local (Exim 4.34) id 1BaNtp-0007dS-Gb; Tue, 15 Jun 2004 20:03:29 -0400 To: Trond Myklebust Cc: nfsv4@linux-nfs.org Subject: [PATCH 1 of 4] Remove an unused parameter. In-Reply-To: <20040616000206.GB29221@fieldses.org> Message-ID: <1087343949.ac7589ca.1@fieldses.org> From: "J. Bruce Fields" Date: Tue, 15 Jun 2004 20:03:29 -0400 X-MailScanner-Information: This message has been scanned for viruses/spam. Contact postmaster@uio.no if you have questions about this scanning X-UiO-MailScanner: No virus found X-UiO-Spam-info: not spam, SpamAssassin (score=0, required 12) X-Evolution-Source: imap://trondmy@imap.uio.no/ Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Remove an unused parameter. Signed-off-by: J. Bruce Fields include/linux/sunrpc/gss_asn1.h | 1 - net/sunrpc/auth_gss/gss_generic_token.c | 2 +- net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff -puN include/linux/sunrpc/gss_asn1.h~krb5_cleanup2 include/linux/sunrpc/gss_asn1.h --- linux-2.6.7-rc3/include/linux/sunrpc/gss_asn1.h~krb5_cleanup2 2004-06-14 21:22:25.000000000 -0400 +++ linux-2.6.7-rc3-bfields/include/linux/sunrpc/gss_asn1.h 2004-06-14 21:22:25.000000000 -0400 @@ -69,7 +69,6 @@ u32 g_verify_token_header( struct xdr_netobj *mech, int *body_size, unsigned char **buf_in, - int tok_type, int toksize); u32 g_get_mech_oid(struct xdr_netobj *mech, struct xdr_netobj * in_buf); diff -puN net/sunrpc/auth_gss/gss_generic_token.c~krb5_cleanup2 net/sunrpc/auth_gss/gss_generic_token.c --- linux-2.6.7-rc3/net/sunrpc/auth_gss/gss_generic_token.c~krb5_cleanup2 2004-06-14 21:22:25.000000000 -0400 +++ linux-2.6.7-rc3-bfields/net/sunrpc/auth_gss/gss_generic_token.c 2004-06-14 21:22:25.000000000 -0400 @@ -179,7 +179,7 @@ EXPORT_SYMBOL(g_make_token_header); */ u32 g_verify_token_header(struct xdr_netobj *mech, int *body_size, - unsigned char **buf_in, int tok_type, int toksize) + unsigned char **buf_in, int toksize) { unsigned char *buf = *buf_in; int seqsize; diff -puN net/sunrpc/auth_gss/gss_krb5_unseal.c~krb5_cleanup2 net/sunrpc/auth_gss/gss_krb5_unseal.c --- linux-2.6.7-rc3/net/sunrpc/auth_gss/gss_krb5_unseal.c~krb5_cleanup2 2004-06-14 21:22:25.000000000 -0400 +++ linux-2.6.7-rc3-bfields/net/sunrpc/auth_gss/gss_krb5_unseal.c 2004-06-14 21:22:25.000000000 -0400 @@ -96,7 +96,7 @@ krb5_read_token(struct krb5_ctx *ctx, dprintk("RPC: krb5_read_token\n"); - if (g_verify_token_header(&ctx->mech_used, &bodysize, &ptr, toktype, + if (g_verify_token_header(&ctx->mech_used, &bodysize, &ptr, read_token->len)) goto out; _