rpcbind: fix for libtiprc 1.0.1

This commit is contained in:
Nikolay Amiantov 2016-01-13 21:16:28 +03:00
parent 9aca5edfdd
commit f48d1f088d
2 changed files with 47 additions and 1 deletions

View File

@ -0,0 +1,43 @@
From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Mon, 2 Nov 2015 17:05:18 -0500
Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly
In the latest libtirpc version to access the xp_auth
one must use the SVC_XP_AUTH macro. To be backwards
compatible a couple ifdefs were added to use the
macro when it exists.
Upstream-Status: Backport
Signed-off-by: Steve Dickson <steved@redhat.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
src/rpcb_svc_com.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
index 4ae93f1..22d6c84 100644
--- a/src/rpcb_svc_com.c
+++ b/src/rpcb_svc_com.c
@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt)
a.rmt_localvers = fi->versnum;
xprt_set_caller(xprt, fi);
+#if defined(SVC_XP_AUTH)
+ SVC_XP_AUTH(xprt) = svc_auth_none;
+#else
xprt->xp_auth = &svc_auth_none;
+#endif
svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a);
+#if !defined(SVC_XP_AUTH)
SVCAUTH_DESTROY(xprt->xp_auth);
xprt->xp_auth = NULL;
+#endif
+
done:
if (buffer)
free(buffer);
--
2.4.0

View File

@ -10,7 +10,10 @@ in stdenv.mkDerivation rec {
sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq";
};
patches = [ ./sunrpc.patch ];
patches = [
./sunrpc.patch
./0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
];
buildInputs = [ libtirpc ]
++ stdenv.lib.optional useSystemd systemd;