diff options
Diffstat (limited to 'main/nfs-utils/0007-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch')
-rw-r--r-- | main/nfs-utils/0007-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/main/nfs-utils/0007-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch b/main/nfs-utils/0007-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch deleted file mode 100644 index c39b01fe0a..0000000000 --- a/main/nfs-utils/0007-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 733d3316dd67aeb175016a098d6d0fd08cefdd33 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 12 Feb 2014 13:54:31 +0000 -Subject: [PATCH] Allow usage of getrpcbynumber() when getrpcbynumber_r() is - unavailable - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - 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 - |