blob: 55926468d98cb23092e89f39662afd5b6e00b5e3 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 5746b68ba9dda87586b3ac88fe84031cbc0015f7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 11 May 2018 12:20:03 -0700
4Subject: [PATCH] Link with libtirpc
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8Upstream-Status: Pending
9
10 configure | 2 +-
11 rpc.rusersd/rusers_proc.c | 7 +------
12 rpc.rusersd/rusersd.c | 6 +-----
13 rup/rup.c | 2 +-
14 4 files changed, 4 insertions(+), 13 deletions(-)
15
16diff --git a/configure b/configure
17index 85f6ca6..2d2d4b7 100755
18--- a/configure
19+++ b/configure
20@@ -147,7 +147,7 @@ else
21 fi
22
23 LDFLAGS=
24-LIBS=
25+LIBS="-ltirpc"
26
27 rm -f __conftest*
28
29diff --git a/rpc.rusersd/rusers_proc.c b/rpc.rusersd/rusers_proc.c
30index 9ae6306..f9e237c 100644
31--- a/rpc.rusersd/rusers_proc.c
32+++ b/rpc.rusersd/rusers_proc.c
33@@ -57,12 +57,7 @@ char rp_rcsid[] =
34 #define RUT_TIME ut_time
35 #endif
36
37-/* Glibc strikes again */
38-#ifdef __GLIBC__
39- #include <rpcsvc/rusers.h>
40-#else
41- #include "rusers.h"
42-#endif
43+#include "rusers.h"
44
45 void rusers_service(struct svc_req *rqstp, SVCXPRT *transp);
46
47diff --git a/rpc.rusersd/rusersd.c b/rpc.rusersd/rusersd.c
48index 762be9b..dd355ac 100644
49--- a/rpc.rusersd/rusersd.c
50+++ b/rpc.rusersd/rusersd.c
51@@ -38,11 +38,7 @@ char rusersd_rcsid[] =
52 #include <rpc/pmap_clnt.h>
53 #include <unistd.h>
54 #include <grp.h>
55-#ifdef __GLIBC__
56- #include <rpcsvc/rusers.h>
57-#else
58- #include "rusers.h"
59-#endif
60+#include "rusers.h"
61
62 #include "../version.h"
63
64diff --git a/rup/rup.c b/rup/rup.c
65index e5669ff..887f89d 100644
66--- a/rup/rup.c
67+++ b/rup/rup.c
68@@ -48,7 +48,7 @@ char rcsid[] = "$Id: rup.c,v 1.8 2000/07/22 19:51:40 dholland Exp $";
69
70 #undef FSHIFT /* Use protocol's shift and scale values */
71 #undef FSCALE
72-#include <rpcsvc/rstat.h>
73+#include "rstat.h"
74
75 #include "../version.h"
76
77--
782.17.0
79