From 63a999865552034ba91dfb99546b1c74b4284d4d Mon Sep 17 00:00:00 2001 From: Vitaliy Gusev Date: Thu, 3 Jan 2019 21:10:33 +0300 Subject: NFS41-1 Fix compilation in snoop --- usr/src/cmd/cmd-inet/usr.sbin/snoop/nfs4_xdr.c | 13 ++----------- usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_nfs4.c | 3 +++ 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'usr') diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/nfs4_xdr.c b/usr/src/cmd/cmd-inet/usr.sbin/snoop/nfs4_xdr.c index 801611ff9b..f0f8dea0d9 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/nfs4_xdr.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/nfs4_xdr.c @@ -157,15 +157,6 @@ xdr_pathname4(register XDR *xdrs, pathname4 *objp) return (TRUE); } -bool_t -xdr_nfs_lockid4(register XDR *xdrs, nfs_lockid4 *objp) -{ - - if (!xdr_uint64_t(xdrs, objp)) - return (FALSE); - return (TRUE); -} - bool_t xdr_nfs_cookie4(register XDR *xdrs, nfs_cookie4 *objp) { @@ -922,9 +913,9 @@ bool_t xdr_clientaddr4(register XDR *xdrs, clientaddr4 *objp) { - if (!xdr_string(xdrs, &objp->r_netid, ~0)) + if (!xdr_string(xdrs, &objp->na_r_netid, ~0)) return (FALSE); - if (!xdr_string(xdrs, &objp->r_addr, ~0)) + if (!xdr_string(xdrs, &objp->na_r_addr, ~0)) return (FALSE); return (TRUE); } diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_nfs4.c b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_nfs4.c index 40a169e931..56ee0fad5e 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_nfs4.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_nfs4.c @@ -50,6 +50,9 @@ /* use the same nfs4_prot.h as the xdr code */ #include "rpcsvc/nfs4_prot.h" +#define r_netid na_r_netid +#define r_addr na_r_addr + /* * XXX With NFS v2 and v3, we only need to xdr the pieces that we care * about. Anything else we can ignore and just skip to the next packet. -- cgit v1.2.3