X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=support%2Fnfs%2Fgetport.c;h=926bab8aa74856584bc04e347affea57103a1613;hb=8f859912e786859d21c341bb8a9b4effbdadb941;hp=734d21ad08b09590938048b898b2203f37040e4f;hpb=336f8bca825416082d62ef38314f3e0b7e8f5cc2;p=nfs-utils.git diff --git a/support/nfs/getport.c b/support/nfs/getport.c index 734d21a..926bab8 100644 --- a/support/nfs/getport.c +++ b/support/nfs/getport.c @@ -60,9 +60,9 @@ #endif /* !HAVE_LIBTIRPC */ #ifdef HAVE_LIBTIRPC -const static rpcvers_t default_rpcb_version = RPCBVERS_4; +static const rpcvers_t default_rpcb_version = RPCBVERS_4; #else /* !HAVE_LIBTIRPC */ -const static rpcvers_t default_rpcb_version = PMAPVERS; +static const rpcvers_t default_rpcb_version = PMAPVERS; #endif /* !HAVE_LIBTIRPC */ #ifdef HAVE_DECL_AI_ADDRCONFIG @@ -458,10 +458,6 @@ static int nfs_gp_ping(CLIENT *client, struct timeval timeout) /* * Initialize the rpcb argument for a GETADDR request. * - * The rpcbind daemon ignores the parms.r_owner field in GETADDR - * requests, but we plant an eye-catcher to help distinguish these - * requests in network traces. - * * Returns 1 if successful, and caller must free strings pointed * to by r_netid and r_addr; otherwise 0. */ @@ -489,7 +485,7 @@ static int nfs_gp_init_rpcb_parms(const struct sockaddr *sap, parms->r_vers = version; parms->r_netid = netid; parms->r_addr = addr; - parms->r_owner = "nfs-utils"; /* eye-catcher */ + parms->r_owner = ""; return 1; }