mount.nfs: support netids in nfs_options2pmap()

[nfs-utils.git] / utils / mount / network.c

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 4ec7c7bc09be37291aafc4f509fc74c0465ac584..ecb5accac0621f1a4f0ccb1c3ce12b9e90315ca0 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -50,6 +50,7 @@
 #include "nfsrpc.h"
 #include "parse_opt.h"
 #include "network.h"
+#include "conffile.h"
 
 #define PMAP_TIMEOUT   (10)
 #define CONNECT_TIMEOUT        (20)
@@ -90,6 +91,7 @@ static const char *nfs_transport_opttbl[] = {
 static const char *nfs_version_opttbl[] = {
        "v2",
        "v3",
+       "v4",
        "vers",
        "nfsvers",
        NULL,
@@ -170,6 +172,27 @@ static const unsigned long probe_mnt3_first[] = {
        0,
 };
 
+static const unsigned int *nfs_default_proto(void);
+#ifdef MOUNT_CONFIG
+static const unsigned int *nfs_default_proto()
+{
+       extern unsigned long config_default_proto;
+       /*
+        * If the default proto has been set and 
+        * its not TCP, start with UDP
+        */
+       if (config_default_proto && config_default_proto != IPPROTO_TCP)
+               return probe_udp_first;
+
+       return probe_tcp_first; 
+}
+#else
+static const unsigned int *nfs_default_proto() 
+{
+       return probe_tcp_first; 
+}
+#endif /* MOUNT_CONFIG */
+
 static int nfs_lookup(const char *hostname, const sa_family_t family,
                      struct sockaddr *sap, socklen_t *salen)
 {
@@ -588,7 +611,6 @@ out_ok:
        nfs_clear_rpc_createerr();
        return 1;
 }
-
 /*
  * Probe a server's NFS service to determine which versions and
  * transport protocols are supported.
@@ -608,10 +630,14 @@ static int nfs_probe_nfsport(const struct sockaddr *sap, const socklen_t salen,
        if (pmap->pm_vers && pmap->pm_prot && pmap->pm_port)
                return 1;
 
-       if (nfs_mount_data_version >= 4)
+       if (nfs_mount_data_version >= 4) {
+               const unsigned int *probe_proto;
+
+               probe_proto = nfs_default_proto();
+
                return nfs_probe_port(sap, salen, pmap,
-                                       probe_nfs3_first, probe_tcp_first);
-       else
+                                       probe_nfs3_first, probe_proto);
+       } else
                return nfs_probe_port(sap, salen, pmap,
                                        probe_nfs2_only, probe_udp_only);
 }
@@ -848,10 +874,14 @@ int nfs_advise_umount(const struct sockaddr *sap, const socklen_t salen,
                        (xdrproc_t)xdr_dirpath, (caddr_t)argp,
                        (xdrproc_t)xdr_void, NULL,
                        timeout);
-       if (verbose && res != RPC_SUCCESS)
-               nfs_error(_("%s: UMNT call failed: %s"),
-                       progname, clnt_sperrno(res));
+       if (res != RPC_SUCCESS) {
+               rpc_createerr.cf_stat = res;
+               CLNT_GETERR(client, &rpc_createerr.cf_error);
+               if (verbose)
+                       nfs_error(_("%s: UMNT call failed: %s"),
+                               progname, clnt_sperrno(res));
 
+       }
        auth_destroy(client->cl_auth);
        CLNT_DESTROY(client);
 
@@ -1199,7 +1229,7 @@ nfs_nfs_program(struct mount_options *options, unsigned long *program)
  * Returns TRUE if @version contains a valid value for this option,
  * or FALSE if the option was specified with an invalid value.
  */
-static int
+int
 nfs_nfs_version(struct mount_options *options, unsigned long *version)
 {
        long tmp;
@@ -1211,10 +1241,13 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
        case 1: /* v3 */
                *version = 3;
                return 1;
-       case 2: /* vers */
+       case 2: /* v4 */
+               *version = 4;
+               return 1;
+       case 3: /* vers */
                switch (po_get_numeric(options, "vers", &tmp)) {
                case PO_FOUND:
-                       if (tmp >= 2 && tmp <= 3) {
+                       if (tmp >= 2 && tmp <= 4) {
                                *version = tmp;
                                return 1;
                        }
@@ -1225,10 +1258,10 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
                case PO_BAD_VALUE:
                        return 0;
                }
-       case 3: /* nfsvers */
+       case 4: /* nfsvers */
                switch (po_get_numeric(options, "nfsvers", &tmp)) {
                case PO_FOUND:
-                       if (tmp >= 2 && tmp <= 3) {
+                       if (tmp >= 2 && tmp <= 4) {
                                *version = tmp;
                                return 1;
                        }
@@ -1253,9 +1286,10 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
  * Returns TRUE if @protocol contains a valid value for this option,
  * or FALSE if the option was specified with an invalid value.
  */
-static int
+int
 nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
 {
+       sa_family_t family;
        char *option;
 
        switch (po_rightmost(options, nfs_transport_opttbl)) {
@@ -1267,17 +1301,8 @@ nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
                return 1;
        case 2: /* proto */
                option = po_get(options, "proto");
-               if (option) {
-                       if (strcmp(option, "tcp") == 0) {
-                               *protocol = IPPROTO_TCP;
-                               return 1;
-                       }
-                       if (strcmp(option, "udp") == 0) {
-                               *protocol = IPPROTO_UDP;
-                               return 1;
-                       }
-                       return 0;
-               }
+               if (option != NULL)
+                       return nfs_get_proto(option, &family, protocol);
        }
 
        /*
@@ -1386,20 +1411,12 @@ nfs_mount_version(struct mount_options *options, unsigned long *version)
 static int
 nfs_mount_protocol(struct mount_options *options, unsigned long *protocol)
 {
+       sa_family_t family;
        char *option;
 
        option = po_get(options, "mountproto");
-       if (option) {
-               if (strcmp(option, "tcp") == 0) {
-                       *protocol = IPPROTO_TCP;
-                       return 1;
-               }
-               if (strcmp(option, "udp") == 0) {
-                       *protocol = IPPROTO_UDP;
-                       return 1;
-               }
-               return 0;
-       }
+       if (option != NULL)
+               return nfs_get_proto(option, &family, protocol);
 
        /*
         * MNT transport protocol wasn't specified.  If the NFS