From patchwork Fri Jan 17 04:11:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simo Sorce X-Patchwork-Id: 3501811 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 845FB9F32F for ; Fri, 17 Jan 2014 04:12:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B7B482015E for ; Fri, 17 Jan 2014 04:12:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C90A52015D for ; Fri, 17 Jan 2014 04:12:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750898AbaAQEMH (ORCPT ); Thu, 16 Jan 2014 23:12:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20390 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751051AbaAQEMF (ORCPT ); Thu, 16 Jan 2014 23:12:05 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0H4C57v025384 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 16 Jan 2014 23:12:05 -0500 Received: from willson.li.ssimo.org.com ([10.3.113.4]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s0H4C3BP014042; Thu, 16 Jan 2014 23:12:04 -0500 From: Simo Sorce To: jlayton@redhat.com Cc: steved@redhat.com, linux-nfs@vger.kernel.org Subject: [PATCH 2/2] Remove unused parameter Date: Thu, 16 Jan 2014 23:11:59 -0500 Message-Id: <1389931919-4801-3-git-send-email-simo@redhat.com> In-Reply-To: <1389931919-4801-2-git-send-email-simo@redhat.com> References: <20140116204949.1bea663a@corrin.poochiereds.net> <1389931919-4801-1-git-send-email-simo@redhat.com> <1389931919-4801-2-git-send-email-simo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 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. Signed-off-by: Simo Sorce --- utils/gssd/krb5_util.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c index cb64a52f3c9c6e6fdb90e007172ecd43f8e2f458..8d4b0e3593a0bd25e00d41c7d0e29322f5f55d6e 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); @@ -1384,7 +1384,7 @@ gssd_acquire_user_cred(uid_t uid, gss_cred_id_t *gss_cred) OM_uint32 maj_stat, 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; }