Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-lb0-f178.google.com ([209.85.217.178]:63796 "EHLO mail-lb0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754069AbaHFGZV (ORCPT ); Wed, 6 Aug 2014 02:25:21 -0400 Received: by mail-lb0-f178.google.com with SMTP id c11so1518747lbj.23 for ; Tue, 05 Aug 2014 23:25:19 -0700 (PDT) From: Natanael Copa To: linux-nfs@vger.kernel.org Cc: Natanael Copa Subject: [PATCH v2 07/11] Allow usage of getrpcbynumber() when getrpcbynumber_r() is unavailable Date: Wed, 6 Aug 2014 08:25:02 +0200 Message-Id: <1407306306-29796-8-git-send-email-ncopa@alpinelinux.org> In-Reply-To: <1407306306-29796-1-git-send-email-ncopa@alpinelinux.org> References: <1407306306-29796-1-git-send-email-ncopa@alpinelinux.org> Sender: linux-nfs-owner@vger.kernel.org List-ID: Signed-off-by: Natanael Copa --- configure.ac | 6 +----- support/nfs/svc_socket.c | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index b9682ed..bc48373 100644 --- a/configure.ac +++ b/configure.ac @@ -248,9 +248,6 @@ AC_CHECK_FUNC([connect], , AC_CHECK_FUNC([getaddrinfo], , [AC_MSG_ERROR([Function 'getaddrinfo' not found.])]) -AC_CHECK_FUNC([getrpcbynumber], , - [AC_MSG_ERROR([Function 'getrpcbynumber' not found.])]) - AC_CHECK_FUNC([getservbyname], , [AC_MSG_ERROR([Function 'getservbyname' not found.])]) @@ -409,12 +406,11 @@ AC_FUNC_STAT AC_FUNC_VPRINTF AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \ gethostbyaddr gethostbyname gethostname getmntent \ - getnameinfo getrpcbyname getifaddrs \ + getnameinfo getrpcbyname getrpcbynumber getrpcbynumber_r getifaddrs \ gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \ ppoll realpath rmdir select socket strcasecmp strchr strdup \ strerror strrchr strtol strtoul sigprocmask name_to_handle_at]) - dnl ************************************************************* dnl Check for data sizes dnl ************************************************************* diff --git a/support/nfs/svc_socket.c b/support/nfs/svc_socket.c index f56f310..61ccf5b 100644 --- a/support/nfs/svc_socket.c +++ b/support/nfs/svc_socket.c @@ -42,8 +42,14 @@ int getservport(u_long number, const char *proto) struct servent servbuf, *servp = NULL; int ret; +#if HAVE_GETRPCBYNUMBER_R ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata, &rpcp); +#else + rpcp = getrpcbynumber(number); + ret = 0; +#endif + if (ret == 0 && rpcp != NULL) { /* First try name. */ ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata, -- 2.0.4