From patchwork Mon Feb 4 14:31:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 10795783 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C59EC159A for ; Mon, 4 Feb 2019 14:30:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5EF02B1D8 for ; Mon, 4 Feb 2019 14:30:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B41332B77B; Mon, 4 Feb 2019 14:30:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C6E22B63A for ; Mon, 4 Feb 2019 14:30:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725992AbfBDOak (ORCPT ); Mon, 4 Feb 2019 09:30:40 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:57937 "EHLO wout2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728520AbfBDOaj (ORCPT ); Mon, 4 Feb 2019 09:30:39 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 6403F3001 for ; Mon, 4 Feb 2019 09:30:36 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 04 Feb 2019 09:30:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=from :to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=CQHjECEP+dCcT V5k2qRzwix6WLYpFTjOHiPw+raa6zY=; b=x3JKaDkeqn8M7+sXFVWca02HxIB4C S5RZPHac9j6YKWkQUbZwF1gBMufwhfZZHYM7ey+7sshAy8XjY0/tKQk1Flcp3nBG bXGDbk/uwhiYZQLhyTo/0BmFAiKvSM3hkrV9f70ae85aq8qTZ8Yg/ErDu4fT3AGz yU7l4ARPVaE+U+O9q0sHjMkFaEcXmDaKK3lB5u8tOnGPOTFVauflTp1WKbPz5bn6 zghGBqQMnH7PzE8F33XlkxY3lDvNmHBPTQHBG2uXLoXawAuYurxVWpsOoSmOryLr 7fmJD11SvCVPVzCugpIAcicSVY8T995819GfPYOiBycybGxWJFT02j89Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=CQHjECEP+dCcTV5k2qRzwix6WLYpFTjOHiPw+raa6zY=; b=G85uSggS E4LHvJtfqN/KYgYHhUmRualAPJH8VNZizJ8t5orl6qZCKYsyTLlNsNFryK2mhYZG TtB6TfTTtwZ/Rg15pzsxyTwHTXPqTSEIwsgOChCSQc/FFxI6YQo6H13BlOcW3W2N qDi6XpUBBsJdrU4e7XtMPAGTOHEya/3bKwLj+ThyEhmqxncEULaMFqdRX5FAm8ZF g2zwKIk0HxI1vJZCXUpVeCvd31D58LtIAc/aSYswLQjjEmOadjkeC9LcGc4d0+MW PHmUcSIyyn3ly1ZWhF+hqtt7xcDu2rLvRw45bGKXxMWGmakAgdazgp5JFdXtYlh3 /nEh4Y7Fbum9lQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrkeeggdeiiecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecufedt tdenucenucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomheprf grthhrihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecukfhppeej kedrheehrddvgeelrdeifeenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrd himhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from NSJAIL (x4e37f93f.dyn.telefonica.de [78.55.249.63]) by mail.messagingengine.com (Postfix) with ESMTPA id 5CEBE10310 for ; Mon, 4 Feb 2019 09:30:35 -0500 (EST) Received: from localhost (10.192.0.11 [10.192.0.11]) by NSJAIL (OpenSMTPD) with ESMTPSA id 2919fab4 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 4 Feb 2019 14:30:32 +0000 (UTC) From: Patrick Steinhardt To: linux-nfs@vger.kernel.org Cc: Patrick Steinhardt Subject: [PATCH 3/3] svc_socket: fix use of undefined macro HAVE_GETRPCBYNUMBER_R Date: Mon, 4 Feb 2019 15:31:20 +0100 Message-Id: <5e9826aa52e17d30d7cfee0d3828c5dbecdbfc41.1549290423.git.ps@pks.im> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The macro HAVE_GETRPCBYNUMBER_R is set based on whether the `getrpcbynumber_r` function was found by autoconf or not. While another location correctly checks whether it is set by using `#ifdef`, `getservport()` instead wrongly uses `#if HAVE_GETRPCBYNUMBER_R`. This may cause a compilation error with gcc with "-Werror=undef" if the macro has not been defined. Fix the error by using `#ifdef` instead. Signed-off-by: Patrick Steinhardt --- support/nfs/svc_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/nfs/svc_socket.c b/support/nfs/svc_socket.c index 1239712..d56507a 100644 --- a/support/nfs/svc_socket.c +++ b/support/nfs/svc_socket.c @@ -46,7 +46,7 @@ int getservport(u_long number, const char *proto) struct rpcent *rpcp; struct servent servbuf, *servp = NULL; int ret = 0; -#if HAVE_GETRPCBYNUMBER_R +#ifdef HAVE_GETRPCBYNUMBER_R char rpcdata[1024]; struct rpcent rpcbuf;