rpc.mountd: let mountd consult /etc/services for port

At RHEL, if user set port for mountd at /etc/services as
"mount   12345/tcp", mountd should be bind to 12345, but the
latest nfs-utils, mountd get a rand port, not 12345.

This patch make sure mountd be bind to the port which was set
at /etc/service.

Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/support/include/rpcmisc.h b/support/include/rpcmisc.h
index 0b06457bbb74d1d8386fd4c343fd825caa804be8..b806227ecc50acd633ae4d375f6edd1bda6994fc 100644 (file)
--- a/support/include/rpcmisc.h
+++ b/support/include/rpcmisc.h
@@ -53,6 +53,7 @@ void          rpc_init(char *name, int prog, int vers,
 void           rpc_dispatch(struct svc_req *rq, SVCXPRT *xprt,
                                struct rpc_dtable *dtable, int nvers,
                                void *argp, void *resp);
 void           rpc_dispatch(struct svc_req *rq, SVCXPRT *xprt,
                                struct rpc_dtable *dtable, int nvers,
                                void *argp, void *resp);

+int            getservport(u_long number, const char *proto);

 
 extern int     _rpcpmstart;
 extern int     _rpcfdtype;
 
 extern int     _rpcpmstart;
 extern int     _rpcfdtype;

diff --git a/support/nfs/svc_create.c b/support/nfs/svc_create.c
index b3f75edc2f9608577da0ea5734011d719c827bc5..c159fc8fbb9e0daa8679fc34a82ce19a1105deda 100644 (file)
--- a/support/nfs/svc_create.c
+++ b/support/nfs/svc_create.c
@@ -393,7 +393,7 @@ nfs_svc_create(char *name, const rpcprog_t program, const rpcvers_t version,
        const struct sigaction create_sigaction = {
                .sa_handler     = SIG_IGN,
        };
        const struct sigaction create_sigaction = {
                .sa_handler     = SIG_IGN,
        };

-       unsigned int visible, up;
+       unsigned int visible, up, servport;

        struct netconfig *nconf;
        void *handlep;
 
        struct netconfig *nconf;
        void *handlep;
 


@@ -417,8 +417,13 @@ nfs_svc_create(char *name, const rpcprog_t program, const rpcvers_t version,
                if (!(nconf->nc_flag & NC_VISIBLE))
                        continue;
                visible++;
                if (!(nconf->nc_flag & NC_VISIBLE))
                        continue;
                visible++;

+               if (port == 0)
+                       servport = getservport(program, nconf->nc_proto);
+               else
+                       servport = port;
+

                up += svc_create_nconf(name, program, version, dispatch,
                up += svc_create_nconf(name, program, version, dispatch,

-                                               port, nconf);
+                                               servport, nconf);

        }
 
        if (visible == 0)
        }
 
        if (visible == 0)

diff --git a/support/nfs/svc_socket.c b/support/nfs/svc_socket.c
index 03a53256c1f4469ec5a36839672eaa6a5a5f0c28..c252f53705630aca4425e87252e59036ee9714c2 100644 (file)
--- a/support/nfs/svc_socket.c
+++ b/support/nfs/svc_socket.c
@@ -35,14 +35,43 @@
 # define __close(f)            close ((f))
 #endif
 
 # define __close(f)            close ((f))
 #endif
 

+int getservport(u_long number, const char *proto)
+{
+       char rpcdata[1024], servdata[1024];
+       struct rpcent rpcbuf, *rpcp;
+       struct servent servbuf, *servp = NULL;
+       int ret;
+
+       ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata,
+                               &rpcp);
+       if (ret == 0 && rpcp != NULL) {
+               /* First try name.  */
+               ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata,
+                                       sizeof servdata, &servp);
+               if ((ret != 0 || servp == NULL) && rpcp->r_aliases) {
+                       const char **a;
+
+                       /* Then we try aliases.  */
+                       for (a = (const char **) rpcp->r_aliases; *a != NULL; a++) {
+                               ret = getservbyname_r(*a, proto, &servbuf, servdata,
+                                                       sizeof servdata, &servp);
+                               if (ret == 0 && servp != NULL)
+                                       break;
+                       }
+               }
+       }
+
+       if (ret == 0 && servp != NULL)
+               return ntohs(servp->s_port);
+
+       return 0;
+}
+

 static int
 svc_socket (u_long number, int type, int protocol, int reuse)
 {
   struct sockaddr_in addr;
   socklen_t len = sizeof (struct sockaddr_in);
 static int
 svc_socket (u_long number, int type, int protocol, int reuse)
 {
   struct sockaddr_in addr;
   socklen_t len = sizeof (struct sockaddr_in);

-  char rpcdata [1024], servdata [1024];
-  struct rpcent rpcbuf, *rpcp;
-  struct servent servbuf, *servp = NULL;

   int sock, ret;
   const char *proto = protocol == IPPROTO_TCP ? "tcp" : "udp";
 
   int sock, ret;
   const char *proto = protocol == IPPROTO_TCP ? "tcp" : "udp";
 


@@ -66,48 +95,13 @@ svc_socket (u_long number, int type, int protocol, int reuse)
 
   memset (&addr, 0, sizeof (addr));
   addr.sin_family = AF_INET;
 
   memset (&addr, 0, sizeof (addr));
   addr.sin_family = AF_INET;

+  addr.sin_port = htons(getservport(number, proto));

 
 

-  ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
-                         &rpcp);
-  if (ret == 0 && rpcp != NULL)
-    {
-      /* First try name.  */
-      ret = getservbyname_r (rpcp->r_name, proto, &servbuf, servdata,
-                            sizeof servdata, &servp);
-      if ((ret != 0 || servp == NULL) && rpcp->r_aliases)
-       {
-         const char **a;
-
-         /* Then we try aliases.  */
-         for (a = (const char **) rpcp->r_aliases; *a != NULL; a++) 
-           {
-             ret = getservbyname_r (*a, proto, &servbuf, servdata,
-                                    sizeof servdata, &servp);
-             if (ret == 0 && servp != NULL)
-               break;
-           }
-       }
-    }
-
-  if (ret == 0 && servp != NULL)
+  if (bind(sock, (struct sockaddr *) &addr, len) < 0)

     {
     {

-      addr.sin_port = servp->s_port;
-      if (bind (sock, (struct sockaddr *) &addr, len) < 0)
-       {
-         perror (_("svc_socket: bind problem"));
-         (void) __close (sock);
-         sock = -1;
-       }
-    }
-  else
-    {
-         addr.sin_port = 0;
-         if (bind (sock, (struct sockaddr *) &addr, len) < 0)
-           {
-             perror (_("svc_socket: bind problem"));
-             (void) __close (sock);
-             sock = -1;
-           }
+      perror (_("svc_socket: bind problem"));
+      (void) __close(sock);
+      sock = -1;

     }
 
   if (sock >= 0)
     }
 
   if (sock >= 0)

diff --git a/utils/mountd/mountd.man b/utils/mountd/mountd.man
index 016a357d67e31f9e73f6e726242bca34f902b396..b60dc90fa07e2d9638ae62a9f801e5ba35318961 100644 (file)
--- a/utils/mountd/mountd.man
+++ b/utils/mountd/mountd.man
@@ -122,7 +122,10 @@ Ignored (compatibility with unfsd??).
 Specifies the port number used for RPC listener sockets.
 If this option is not specified,
 .B rpc.mountd
 Specifies the port number used for RPC listener sockets.
 If this option is not specified,
 .B rpc.mountd

-chooses a random ephemeral port for each listener socket.
+will try to consult
+.IR /etc/services ,
+if gets port succeed, set the same port for all listener socket,
+otherwise chooses a random ephemeral port for each listener socket.

 .IP
 This option can be used to fix the port value of
 .BR rpc.mountd 's
 .IP
 This option can be used to fix the port value of
 .BR rpc.mountd 's

diff --git a/utils/statd/statd.man b/utils/statd/statd.man
index b72236c74b8a0573de88bd848e37003cbd0f3c49..203f8c97ae2da491c7e9e6d07330e3edebbd5ab7 100644 (file)
--- a/utils/statd/statd.man
+++ b/utils/statd/statd.man
@@ -219,7 +219,10 @@ for details.
 Specifies the port number used for RPC listener sockets.
 If this option is not specified,
 .B rpc.statd
 Specifies the port number used for RPC listener sockets.
 If this option is not specified,
 .B rpc.statd

-chooses a random ephemeral port for each listener socket.
+will try to consult
+.IR /etc/services ,
+if gets port succeed, set the same port for all listener socket,
+otherwise chooses a random ephemeral port for each listener socket.

 .IP
 This option can be used to fix the port value of its listeners when
 SM_NOTIFY requests must traverse a firewall between clients and servers.
 .IP
 This option can be used to fix the port value of its listeners when
 SM_NOTIFY requests must traverse a firewall between clients and servers.