From e91545265f0ccce179a78504b6ab7f3130bf0e67 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Tue, 3 Nov 2015 04:24:16 -0500
Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 rpcbind-0.2.3-xp_auth.patch | 21 +++++++++++++++++++++
 rpcbind.spec                |  7 ++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 rpcbind-0.2.3-xp_auth.patch

diff --git a/rpcbind-0.2.3-xp_auth.patch b/rpcbind-0.2.3-xp_auth.patch
new file mode 100644
index 0000000..fc0797b
--- /dev/null
+++ b/rpcbind-0.2.3-xp_auth.patch
@@ -0,0 +1,21 @@
+diff -up rpcbind-0.2.3/src/rpcb_svc_com.c.orig rpcbind-0.2.3/src/rpcb_svc_com.c
+--- rpcbind-0.2.3/src/rpcb_svc_com.c.orig	2015-11-02 16:23:08.584000000 -0500
++++ rpcbind-0.2.3/src/rpcb_svc_com.c	2015-11-02 16:58:20.386000000 -0500
+@@ -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);
diff --git a/rpcbind.spec b/rpcbind.spec
index 13bca1c..d17d2ac 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -1,6 +1,6 @@
 Name:           rpcbind
 Version:        0.2.3
-Release:        0.5%{?dist}
+Release:        0.6%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        BSD
@@ -22,6 +22,7 @@ Requires(preun): systemd
 Requires(postun): systemd coreutils
 
 Patch001: rpcbind-0.2.3-pmap_callit.diff
+Patch002: rpcbind-0.2.3-xp_auth.patch
 
 Provides: portmap = %{version}-%{release}
 Obsoletes: portmap <= 4.0-65.3
@@ -35,6 +36,7 @@ RPC calls on a server on that machine.
 %setup -q
 
 %patch001 -p1
+%patch002 -p1
 
 %build
 %ifarch s390 s390x
@@ -126,6 +128,9 @@ fi
 %{_unitdir}/rpcbind.socket
 
 %changelog
+* Tue Nov  3 2015 Steve Dickson <steved@redhat.com> - 0.2.3-0.6
+- handle_reply: Don't use the xp_auth pointer directly
+
 * Mon Nov  2 2015 Steve Dickson <steved@redhat.com> - 0.2.3-0.5
 - Support nss-altfiles by adding 'altfiles' to nss lookup path (bz 1159941).