blob: 16b763ef0decea21fb3eb02c8277078a8abde6b7 [file] [log] [blame]
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05001From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001
2From: Steve Dickson <steved@redhat.com>
3Date: Mon, 2 Nov 2015 17:05:18 -0500
4Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly
5
6In the latest libtirpc version to access the xp_auth
7one must use the SVC_XP_AUTH macro. To be backwards
8compatible a couple ifdefs were added to use the
9macro when it exists.
10
11Upstream-Status: Backport
12
13Signed-off-by: Steve Dickson <steved@redhat.com>
14Signed-off-by: Maxin B. John <maxin.john@intel.com>
15---
16 src/rpcb_svc_com.c | 7 +++++++
17 1 file changed, 7 insertions(+)
18
19diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
20index 4ae93f1..22d6c84 100644
21--- a/src/rpcb_svc_com.c
22+++ b/src/rpcb_svc_com.c
23@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt)
24 a.rmt_localvers = fi->versnum;
25
26 xprt_set_caller(xprt, fi);
27+#if defined(SVC_XP_AUTH)
28+ SVC_XP_AUTH(xprt) = svc_auth_none;
29+#else
30 xprt->xp_auth = &svc_auth_none;
31+#endif
32 svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a);
33+#if !defined(SVC_XP_AUTH)
34 SVCAUTH_DESTROY(xprt->xp_auth);
35 xprt->xp_auth = NULL;
36+#endif
37+
38 done:
39 if (buffer)
40 free(buffer);
41--
422.4.0
43