From patchwork Fri Jan 17 16:56:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simo Sorce X-Patchwork-Id: 3506311 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 97C4CC02DC for ; Fri, 17 Jan 2014 16:56:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B8D5D2017B for ; Fri, 17 Jan 2014 16:56:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B5D4F20142 for ; Fri, 17 Jan 2014 16:56:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752766AbaAQQ4s (ORCPT ); Fri, 17 Jan 2014 11:56:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33679 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752629AbaAQQ4q (ORCPT ); Fri, 17 Jan 2014 11:56:46 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0HGuj0B007167 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 17 Jan 2014 11:56:46 -0500 Received: from willson.li.ssimo.org.com ([10.3.113.4]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s0HGuhUs012059; Fri, 17 Jan 2014 11:56:45 -0500 From: Simo Sorce To: jlayton@redhat.com Cc: steved@redhat.com, linux-nfs@vger.kernel.org Subject: [PATCH 2/2] Remove unused arguments Date: Fri, 17 Jan 2014 11:56:40 -0500 Message-Id: <1389977800-10922-3-git-send-email-simo@redhat.com> In-Reply-To: <1389977800-10922-2-git-send-email-simo@redhat.com> References: <1389931919-4801-1-git-send-email-simo@redhat.com> <1389977800-10922-1-git-send-email-simo@redhat.com> <1389977800-10922-2-git-send-email-simo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The name variable is always set to NULL now in all callers, so just sto passing it around needlessly. The uid_t variable is not used at all, so chuck it out too. Signed-off-by: Simo Sorce --- utils/gssd/gssd_proc.c | 2 +- utils/gssd/krb5_util.c | 10 +++++----- utils/gssd/krb5_util.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c index 2a6ea97135848eaf601bbed17e5b62cb77bd66b9..33cfeb2afd2ed6c6810dc39548b1a9da8daa8c37 100644 --- a/utils/gssd/gssd_proc.c +++ b/utils/gssd/gssd_proc.c @@ -1095,7 +1095,7 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname, /* Tell krb5 gss which credentials cache to use */ /* Try first to acquire credentials directly via GSSAPI */ - err = gssd_acquire_user_cred(uid, &gss_cred); + err = gssd_acquire_user_cred(&gss_cred); if (!err) create_resp = create_auth_rpc_client(clp, tgtname, &rpc_clnt, &auth, uid, AUTHTYPE_KRB5, gss_cred); diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c index 230b909b14d244f832c0b5dd62e600cf8db4f80b..208c72bc072bceecc81f591887603e274dc35d9b 100644 --- a/utils/gssd/krb5_util.c +++ b/utils/gssd/krb5_util.c @@ -1359,12 +1359,12 @@ gssd_k5_get_default_realm(char **def_realm) } static int -gssd_acquire_krb5_cred(gss_name_t name, gss_cred_id_t *gss_cred) +gssd_acquire_krb5_cred(gss_cred_id_t *gss_cred) { OM_uint32 maj_stat, min_stat; gss_OID_set_desc desired_mechs = { 1, &krb5oid }; - maj_stat = gss_acquire_cred(&min_stat, name, GSS_C_INDEFINITE, + maj_stat = gss_acquire_cred(&min_stat, GSS_C_NO_NAME, GSS_C_INDEFINITE, &desired_mechs, GSS_C_INITIATE, gss_cred, NULL, NULL); @@ -1379,12 +1379,12 @@ gssd_acquire_krb5_cred(gss_name_t name, gss_cred_id_t *gss_cred) } int -gssd_acquire_user_cred(uid_t uid, gss_cred_id_t *gss_cred) +gssd_acquire_user_cred(gss_cred_id_t *gss_cred) { OM_uint32 min_stat; int ret; - ret = gssd_acquire_krb5_cred(GSS_C_NO_NAME, gss_cred); + ret = gssd_acquire_krb5_cred(gss_cred); /* force validation of cred to check for expiry */ if (ret == 0) { @@ -1423,7 +1423,7 @@ limit_krb5_enctypes(struct rpc_gss_sec *sec) int err = -1; if (sec->cred == GSS_C_NO_CREDENTIAL) { - err = gssd_acquire_krb5_cred(GSS_C_NO_NAME, &sec->cred); + err = gssd_acquire_krb5_cred(&sec->cred); if (err) return -1; } diff --git a/utils/gssd/krb5_util.h b/utils/gssd/krb5_util.h index 3f0723e05cb3fd24b8063941e715010b21db0515..a319588a61253420da1ba7f62124df6b74795eea 100644 --- a/utils/gssd/krb5_util.h +++ b/utils/gssd/krb5_util.h @@ -35,7 +35,7 @@ int gssd_refresh_krb5_machine_credential(char *hostname, char *gssd_k5_err_msg(krb5_context context, krb5_error_code code); void gssd_k5_get_default_realm(char **def_realm); -int gssd_acquire_user_cred(uid_t uid, gss_cred_id_t *gss_cred); +int gssd_acquire_user_cred(gss_cred_id_t *gss_cred); #ifdef HAVE_SET_ALLOWABLE_ENCTYPES extern int limit_to_legacy_enctypes;