diff mbox

handle_reply: Don't use the xp_auth pointer directly

Message ID 1446502376-8252-1-git-send-email-steved@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Steve Dickson Nov. 2, 2015, 10:12 p.m. UTC 
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.

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 src/rpcb_svc_com.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Steve Dickson Nov. 3, 2015, 9:23 a.m. UTC | #1 
On 11/02/2015 05:12 PM, Steve Dickson wrote:
> 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.
> 
> Signed-off-by: Steve Dickson <steved@redhat.com>
Committed... 

steved.

> ---
>  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);
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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);