49a2bb396c
Fixes CVE-2017-8779: http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commitdiff;h=dd9c7cf4f8f375c6d641b760d124650c418c2ce3 Rebased patches 0001, 0002 & 0006. Removed patch 0007, applied upstream: http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=4f1503e84b2f7bd229a097335e52fb8203f5bb0b Renumbered patch 0008. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 7aa1fe6a0f9280571117c30c03c2cc521cd86ec3 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Sat, 23 Jun 2012 21:58:07 +0200
|
|
Subject: [PATCH] uClibc without RPC support and musl does not install rpcent.h
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
[yann.morin.1998@free.fr: update for 0.3.1]
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
[joerg.krause@embedded.rocks: musl fix]
|
|
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
|
[bernd.kuhls@t-online.de: update for 1.0.2]
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
---
|
|
tirpc/rpc/rpcent.h | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
|
|
index 147f909..4a58180 100644
|
|
--- a/tirpc/rpc/rpcent.h
|
|
+++ b/tirpc/rpc/rpcent.h
|
|
@@ -48,8 +48,9 @@
|
|
extern "C" {
|
|
#endif
|
|
|
|
-/* These are defined in /usr/include/rpc/netdb.h */
|
|
-#if !defined(__GLIBC__) || defined(__UCLIBC__)
|
|
+/* These are defined in /usr/include/rpc/netdb.h, unless we are using
|
|
+ the C library without RPC support. */
|
|
+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__)
|
|
struct rpcent {
|
|
char *r_name; /* name of server for this rpc program */
|
|
char **r_aliases; /* alias list */
|
|
--
|
|
1.9.1
|
|
|