From patchwork Fri Mar 8 19:47:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 2240281 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id C0F544006E for ; Fri, 8 Mar 2013 19:47:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751634Ab3CHTr0 (ORCPT ); Fri, 8 Mar 2013 14:47:26 -0500 Received: from mail-ia0-f171.google.com ([209.85.210.171]:51680 "EHLO mail-ia0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751491Ab3CHTrZ (ORCPT ); Fri, 8 Mar 2013 14:47:25 -0500 Received: by mail-ia0-f171.google.com with SMTP id z13so1841706iaz.16 for ; Fri, 08 Mar 2013 11:47:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:subject:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=J4uPucjvZx3dth4ZPCBeXAEqy136EFuEi7+x/xJs0Bc=; b=Qj0JWo5JvBLgSjRiI/uufKUCEL2M+2KbYzxPPy6N4DbHVssV2uwNsIcv2WAo3y6CUp U+9p3bfbCF3Tj4cwGErM2b4p4ESvCikd2ibiKjYzsb62VQfZrNagPKa2EGEFQ7D+t+R+ 9J3MpTj3vcAS1mw0gk9p7ZBO6gA9GuMXAQic4MOrFwJjy9Mdl4ff5mVqcnVylLuAXRPQ zkQpjhaspcRX//7r+gMLy+Pll/3VAzxyxrR+TZycfLTrSQrVxME0R/E8fBRTy9z9x+Np m/QjTH64U9eFTWUA31IdAfZyGFhgGnjXJcWXMMRIMZAYCP92b13CRbBnUyrx1I2zMje8 o4jQ== X-Received: by 10.50.100.193 with SMTP id fa1mr171460igb.59.1362772045137; Fri, 08 Mar 2013 11:47:25 -0800 (PST) Received: from seurat.1015granger.net ([99.26.161.222]) by mx.google.com with ESMTPS id wx2sm393959igb.4.2013.03.08.11.47.24 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 08 Mar 2013 11:47:24 -0800 (PST) From: Chuck Lever Subject: [PATCH 09/11] gssd: Fix whitespace nits To: linux-nfs@vger.kernel.org Cc: Chuck Lever Date: Fri, 08 Mar 2013 14:47:23 -0500 Message-ID: <20130308194723.5656.72933.stgit@seurat.1015granger.net> In-Reply-To: <20130308193830.5656.44184.stgit@seurat.1015granger.net> References: <20130308193830.5656.44184.stgit@seurat.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Chuck Lever --- utils/gssd/gssd_proc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c index c17ab3b..6b5e90e 100644 --- a/utils/gssd/gssd_proc.c +++ b/utils/gssd/gssd_proc.c @@ -169,7 +169,7 @@ sockaddr_to_hostname(const struct sockaddr *sa, const char *addr) { socklen_t addrlen; int err; - char *hostname; + char *hostname; char hbuf[NI_MAXHOST]; switch (sa->sa_family) { @@ -708,7 +708,7 @@ out_err: /* * If the port isn't already set, do an rpcbind query to the remote server - * using the program and version and get the port. + * using the program and version and get the port. * * Newer kernels send the value of the port= mount option in the "info" * file for the upcall or '0' for NFSv2/3. For NFSv4 it sends the value @@ -1013,7 +1013,7 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname, printerr(0, "ERROR: No credentials found " "for connection to server %s\n", clp->servername); - goto out_return_error; + goto out_return_error; } for (ccname = credlist; ccname && *ccname; ccname++) { gssd_setup_krb5_machine_gss_ccache(*ccname); @@ -1023,12 +1023,12 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname, /* Success! */ success++; break; - } + } printerr(2, "WARNING: Failed to create machine krb5 context " "with credentials cache %s for server %s\n", *ccname, clp->servername); } - gssd_free_krb5_machine_cred_list(credlist); + gssd_free_krb5_machine_cred_list(credlist); if (!success) { if(nocache == 0) { nocache++; @@ -1225,6 +1225,6 @@ out: free(enctypes); free(target); free(service); - return; + return; }