getport: RPCB_GETADDR r_owner should be an empty string

[nfs-utils.git] / support / nfs / getport.c

diff --git a/support/nfs/getport.c b/support/nfs/getport.c
index 2255b7d1bc86f344bd2f51ac175325bdad1468b6..926bab8aa74856584bc04e347affea57103a1613 100644 (file)
--- a/support/nfs/getport.c
+++ b/support/nfs/getport.c
@@ -41,8 +41,8 @@
 #include <rpc/pmap_prot.h>
 
 #ifdef HAVE_LIBTIRPC
-#include <tirpc/netconfig.h>
-#include <tirpc/rpc/rpcb_prot.h>
+#include <netconfig.h>
+#include <rpc/rpcb_prot.h>
 #endif
 
 #include "nfsrpc.h"
@@ -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;
 }