From patchwork Thu May 7 07:19:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 6354331 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DC7F3BEEE1 for ; Thu, 7 May 2015 07:19:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 23958203AD for ; Thu, 7 May 2015 07:19:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 36F5A203AC for ; Thu, 7 May 2015 07:19:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751675AbbEGHTZ (ORCPT ); Thu, 7 May 2015 03:19:25 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:60201 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753231AbbEGHTM (ORCPT ); Thu, 7 May 2015 03:19:12 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id C2D68340EE3; Thu, 7 May 2015 07:19:11 +0000 (UTC) From: Mike Frysinger To: libtirpc-devel@lists.sourceforge.net Cc: linux-nfs@vger.kernel.org Subject: [PATCH libtirpc] fix build w/gssapi disabled Date: Thu, 7 May 2015 03:19:09 -0400 Message-Id: <1430983149-22199-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 2.4.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 Starting with commit d5259e751111cb108c784b044296185f543fc0be (Add header definitions for rpc_gss_*() APIs), the gss headers were pulled in all the time leading to build failures like so: CC libtirpc_la-bindresvport.lo In file included from ../tirpc/rpc/svc_auth.h:44:0, from ../tirpc/rpc/rpc.h:68, from bindresvport.c:46: ../tirpc/rpc/rpcsec_gss.h:38:27: fatal error: gssapi/gssapi.h: No such file or directory Signed-off-by: Mike Frysinger --- tirpc/rpc/svc_auth.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h index 44b38bf..998b13a 100644 --- a/tirpc/rpc/svc_auth.h +++ b/tirpc/rpc/svc_auth.h @@ -41,6 +41,8 @@ #ifndef _RPC_SVC_AUTH_H #define _RPC_SVC_AUTH_H +#ifdef HAVE_RPCSEC_GSS + #include typedef struct { @@ -51,6 +53,8 @@ typedef struct { u_int seq_num; } svc_rpc_gss_parms_t; +#endif + /* * Interface to server-side authentication flavors. */ @@ -63,8 +67,10 @@ typedef struct SVCAUTH { int (*svc_ah_destroy)(struct SVCAUTH *); } *svc_ah_ops; caddr_t svc_ah_private; +#ifdef HAVE_RPCSEC_GSS svc_rpc_gss_parms_t svc_gss_params; rpc_gss_rawcred_t raw_cred; +#endif } SVCAUTH; #define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \