]> git.decadent.org.uk Git - nfs-utils.git/blobdiff - utils/mount/stropts.c
mount.nfs: Assume v2/v3 if mount-related options are present
[nfs-utils.git] / utils / mount / stropts.c
index 1d2cde6d0386d4bfc702134b8f62b420289543bb..a0b9e7fdf80a0f8967bda37c05b1ee34444769a0 100644 (file)
  *
  */
 
-#include <ctype.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <netdb.h>
 #include <time.h>
+
 #include <sys/socket.h>
 #include <sys/mount.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include "xcommon.h"
 #include "mount.h"
 #include "nls.h"
-#include "nfs_mount.h"
 #include "mount_constants.h"
 #include "stropts.h"
 #include "error.h"
 #include "network.h"
 #include "parse_opt.h"
+#include "version.h"
+#include "parse_dev.h"
+#include "conffile.h"
 
-#ifdef HAVE_RPCSVC_NFS_PROT_H
-#include <rpcsvc/nfs_prot.h>
-#else
-#include <linux/nfs.h>
-#define nfsstat nfs_stat
+#ifndef NFS_PROGRAM
+#define NFS_PROGRAM    (100003)
 #endif
 
 #ifndef NFS_PORT
-#define NFS_PORT 2049
+#define NFS_PORT       (2049)
 #endif
 
 #ifndef NFS_MAXHOSTNAME
 #define NFS_MAXPATHNAME                (1024)
 #endif
 
+#ifndef NFS_DEF_FG_TIMEOUT_MINUTES
+#define NFS_DEF_FG_TIMEOUT_MINUTES     (2u)
+#endif
+
+#ifndef NFS_DEF_BG_TIMEOUT_MINUTES
+#define NFS_DEF_BG_TIMEOUT_MINUTES     (10000u)
+#endif
+
 extern int nfs_mount_data_version;
 extern char *progname;
 extern int verbose;
+extern int sloppy;
 
-static int parse_devname(const char *spec, char **hostname)
-{
-       int ret = 0;
-       char *dev, *pathname, *s;
+struct nfsmount_info {
+       const char              *spec,          /* server:/path */
+                               *node,          /* mounted-on dir */
+                               *type;          /* "nfs" or "nfs4" */
+       char                    *hostname;      /* server's hostname */
+       struct sockaddr_storage address;        /* server's address */
+       socklen_t               salen;          /* size of server's address */
 
-       dev = xstrdup(spec);
+       struct mount_options    *options;       /* parsed mount options */
+       char                    **extra_opts;   /* string for /etc/mtab */
 
-       if (!(pathname = strchr(dev, ':'))) {
-               nfs_error(_("%s: remote share not in 'host:dir' format"),
-                               progname);
-               goto out;
-       }
-       *pathname = '\0';
-       pathname++;
+       unsigned long           version;        /* NFS version */
+       int                     flags,          /* MS_ flags */
+                               fake,           /* actually do the mount? */
+                               child;          /* forked bg child? */
+};
 
-       /*
-        * We don't need a copy of the pathname, but let's
-        * sanity check it anyway.
-        */
-       if (strlen(pathname) > NFS_MAXPATHNAME) {
-               nfs_error(_("%s: export pathname is too long"),
-                               progname);
-               goto out;
-       }
+#ifdef MOUNT_CONFIG
+static void nfs_default_version(struct nfsmount_info *mi);
 
+static void nfs_default_version(struct nfsmount_info *mi)
+{
+       extern unsigned long config_default_vers;
        /*
-        * Ignore all but first hostname in replicated mounts
-        * until they can be fully supported. (mack@sgi.com)
+        * Use the default value set in the config file when
+        * the version has not been explicitly set.
         */
-       if ((s = strchr(dev, ','))) {
-               *s = '\0';
-               nfs_error(_("%s: warning: multiple hostnames not supported"),
-                               progname);
-               nfs_error(_("%s: ignoring hostnames that follow the first one"),
-                               progname);
-       }
-       *hostname = xstrdup(dev);
-       if (strlen(*hostname) > NFS_MAXHOSTNAME) {
-               nfs_error(_("%s: server hostname is too long"),
-                               progname);
-               free(*hostname);
-               goto out;
+       if (mi->version == 0 && config_default_vers) {
+               if (config_default_vers < 4)
+                       mi->version = config_default_vers;
        }
+}
+#else
+inline void nfs_default_version(struct nfsmount_info *mi) {}
+#endif /* MOUNT_CONFIG */
 
-       ret = 1;
+/*
+ * Obtain a retry timeout value based on the value of the "retry=" option.
+ *
+ * Returns a time_t timeout timestamp, in seconds.
+ */
+static time_t nfs_parse_retry_option(struct mount_options *options,
+                                    unsigned int timeout_minutes)
+{
+       long tmp;
 
-out:
-       free(dev);
-       return ret;
+       switch (po_get_numeric(options, "retry", &tmp)) {
+       case PO_NOT_FOUND:
+               break;
+       case PO_FOUND:
+               if (tmp >= 0) {
+                       timeout_minutes = tmp;
+                       break;
+               }
+       case PO_BAD_VALUE:
+               if (verbose)
+                       nfs_error(_("%s: invalid retry timeout was specified; "
+                                       "using default timeout"), progname);
+               break;
+       }
+
+       return time(NULL) + (time_t)(timeout_minutes * 60);
 }
 
-static int fill_ipv4_sockaddr(const char *hostname, struct sockaddr_in *addr)
+/*
+ * Convert the passed-in sockaddr-style address to presentation
+ * format, then append an option of the form "keyword=address".
+ *
+ * Returns 1 if the option was appended successfully; otherwise zero.
+ */
+static int nfs_append_generic_address_option(const struct sockaddr *sap,
+                                            const socklen_t salen,
+                                            const char *keyword,
+                                            struct mount_options *options)
 {
-       struct hostent *hp;
-       addr->sin_family = AF_INET;
+       char address[NI_MAXHOST];
+       char new_option[512];
+       int len;
+
+       if (!nfs_present_sockaddr(sap, salen, address, sizeof(address)))
+               goto out_err;
+
+       len = snprintf(new_option, sizeof(new_option), "%s=%s",
+                                               keyword, address);
+       if (len < 0 || (size_t)len >= sizeof(new_option))
+               goto out_err;
+
+       if (po_append(options, new_option) != PO_SUCCEEDED)
+               goto out_err;
 
-       if (inet_aton(hostname, &addr->sin_addr))
-               return 1;
-       if ((hp = gethostbyname(hostname)) == NULL) {
-               nfs_error(_("%s: can't get address for %s\n"),
-                               progname, hostname);
-               return 0;
-       }
-       if (hp->h_length > sizeof(struct in_addr)) {
-               nfs_error(_("%s: got bad hp->h_length"), progname);
-               hp->h_length = sizeof(struct in_addr);
-       }
-       memcpy(&addr->sin_addr, hp->h_addr, hp->h_length);
        return 1;
+
+out_err:
+       nfs_error(_("%s: failed to construct %s option"), progname, keyword);
+       return 0;
 }
 
 /*
@@ -148,19 +185,12 @@ static int fill_ipv4_sockaddr(const char *hostname, struct sockaddr_in *addr)
  * Returns 1 if 'addr=' option appended successfully;
  * otherwise zero.
  */
-static int append_addr_option(struct sockaddr_in *saddr,
-                          struct mount_options *options)
+static int nfs_append_addr_option(const struct sockaddr *sap,
+                                 socklen_t salen,
+                                 struct mount_options *options)
 {
-       char new_option[24];
-
        po_remove_all(options, "addr");
-
-       snprintf(new_option, sizeof(new_option) - 1,
-                       "addr=%s", inet_ntoa(saddr->sin_addr));
-
-       if (po_append(options, new_option) == PO_SUCCEEDED)
-               return 1;
-       return 0;
+       return nfs_append_generic_address_option(sap, salen, "addr", options);
 }
 
 /*
@@ -170,337 +200,655 @@ static int append_addr_option(struct sockaddr_in *saddr,
  * Returns 1 if 'clientaddr=' option created successfully or if
  * 'clientaddr=' option is already present; otherwise zero.
  */
-static int append_clientaddr_option(struct sockaddr_in *saddr,
-                                   struct mount_options *options)
+static int nfs_append_clientaddr_option(const struct sockaddr *sap,
+                                       socklen_t salen,
+                                       struct mount_options *options)
 {
-       struct sockaddr_in my_addr;
-       char new_option[32];
+       struct sockaddr_storage dummy;
+       struct sockaddr *my_addr = (struct sockaddr *)&dummy;
+       socklen_t my_len = sizeof(dummy);
 
-       if (po_contains(options, "clientaddr") == PO_SUCCEEDED)
+       if (po_contains(options, "clientaddr") == PO_FOUND)
                return 1;
 
-       if (!get_client_address(saddr, &my_addr))
-               return 0;
-
-       snprintf(new_option, sizeof(new_option) - 1,
-                       "clientaddr=%s", inet_ntoa(my_addr.sin_addr));
+       nfs_callback_address(sap, salen, my_addr, &my_len);
 
-       if (po_append(options, new_option) == PO_SUCCEEDED)
-               return 1;
-       return 0;
+       return nfs_append_generic_address_option(my_addr, my_len,
+                                                       "clientaddr", options);
 }
 
 /*
  * Resolve the 'mounthost=' hostname and append a new option using
- * the resulting IPv4 address.
+ * the resulting address.
  */
-static int fix_mounthost_option(struct mount_options *options)
+static int nfs_fix_mounthost_option(struct mount_options *options)
 {
-       struct sockaddr_in maddr;
-       char *mounthost, new_option[32];
+       struct sockaddr_storage dummy;
+       struct sockaddr *sap = (struct sockaddr *)&dummy;
+       socklen_t salen = sizeof(dummy);
+       char *mounthost;
 
        mounthost = po_get(options, "mounthost");
        if (!mounthost)
                return 1;
 
-       if (!fill_ipv4_sockaddr(mounthost, &maddr))
+       if (!nfs_name_to_address(mounthost, sap, &salen)) {
+               nfs_error(_("%s: unable to determine mount server's address"),
+                               progname);
+               return 0;
+       }
+
+       return nfs_append_generic_address_option(sap, salen,
+                                                       "mountaddr", options);
+}
+
+/*
+ * Returns zero if the "lock" option is in effect, but statd
+ * can't be started.  Otherwise, returns 1.
+ */
+static const char *nfs_lock_opttbl[] = {
+       "nolock",
+       "lock",
+       NULL,
+};
+
+static int nfs_verify_lock_option(struct mount_options *options)
+{
+       if (po_rightmost(options, nfs_lock_opttbl) == 0)
+               return 1;
+
+       if (!start_statd()) {
+               nfs_error(_("%s: rpc.statd is not running but is "
+                           "required for remote locking."), progname);
+               nfs_error(_("%s: Either use '-o nolock' to keep "
+                           "locks local, or start statd."), progname);
                return 0;
+       }
 
-       snprintf(new_option, sizeof(new_option) - 1,
-                       "mountaddr=%s", inet_ntoa(maddr.sin_addr));
+       return 1;
+}
 
-       if (po_append(options, new_option) == PO_SUCCEEDED)
+static int nfs_append_sloppy_option(struct mount_options *options)
+{
+       if (!sloppy || linux_version_code() < MAKE_VERSION(2, 6, 27))
                return 1;
-       return 0;
+
+       if (po_append(options, "sloppy") == PO_FAILED)
+               return 0;
+       return 1;
+}
+
+static int nfs_set_version(struct nfsmount_info *mi)
+{
+       if (!nfs_nfs_version(mi->options, &mi->version))
+               return 0;
+
+       if (strncmp(mi->type, "nfs4", 4) == 0)
+               mi->version = 4;
+       else {
+               char *option = po_get(mi->options, "proto");
+               if (option && strcmp(option, "rdma") == 0)
+                       mi->version = 3;
+       }
+
+       /*
+        * If we still don't know, check for version-specific
+        * mount options.
+        */
+       if (mi->version == 0) {
+               if (po_contains(mi->options, "mounthost") ||
+                   po_contains(mi->options, "mountaddr") ||
+                   po_contains(mi->options, "mountvers") ||
+                   po_contains(mi->options, "mountproto"))
+                       mi->version = 3;
+       }
+
+       /*
+        * If enabled, see if the default version was
+        * set in the config file
+        */
+       nfs_default_version(mi);
+       
+       return 1;
 }
 
 /*
- * Set up mandatory mount options.
+ * Set up mandatory non-version specific NFS mount options.
  *
  * Returns 1 if successful; otherwise zero.
  */
-static int set_mandatory_options(const char *type,
-                                struct sockaddr_in *saddr,
-                                struct mount_options *options)
+static int nfs_validate_options(struct nfsmount_info *mi)
 {
-       if (!append_addr_option(saddr, options))
+       struct sockaddr *sap = (struct sockaddr *)&mi->address;
+
+       if (!nfs_parse_devname(mi->spec, &mi->hostname, NULL))
                return 0;
 
-       if (strncmp(type, "nfs4", 4) == 0) {
-               if (!append_clientaddr_option(saddr, options))
-                       return 0;
-       } else {
-               if (!fix_mounthost_option(options))
-                       return 0;
-       }
+       mi->salen = sizeof(mi->address);
+       if (!nfs_name_to_address(mi->hostname, sap, &mi->salen))
+               return 0;
+
+       if (!nfs_set_version(mi))
+               return 0;
+
+       if (!nfs_append_sloppy_option(mi->options))
+               return 0;
+
+       if (!nfs_append_addr_option(sap, mi->salen, mi->options))
+               return 0;
 
        return 1;
 }
 
 /*
- * Reconstruct the mount option string based on a portmapper probe
- * of the server.  Returns one if the server's portmapper returned
- * something we can use, otherwise zero.
- *
- * To handle version and transport protocol fallback properly, we
- * need to parse some of the mount options in order to set up a
- * portmap probe.  Mount options that rewrite_mount_options()
- * doesn't recognize are left alone.
+ * Get NFS/mnt server addresses from mount options
  *
- * Returns a new group of mount options if successful; otherwise
- * NULL is returned if some failure occurred.
+ * Returns 1 and fills in @nfs_saddr, @nfs_salen, @mnt_saddr, and @mnt_salen
+ * if all goes well; otherwise zero.
  */
-static struct mount_options *rewrite_mount_options(char *str)
+static int nfs_extract_server_addresses(struct mount_options *options,
+                                       struct sockaddr *nfs_saddr,
+                                       socklen_t *nfs_salen,
+                                       struct sockaddr *mnt_saddr,
+                                       socklen_t *mnt_salen)
 {
-       struct mount_options *options;
-       char *option, new_option[64];
-       clnt_addr_t mnt_server = { };
-       clnt_addr_t nfs_server = { };
-       int p;
-
-       options = po_split(str);
-       if (!options)
-               return NULL;
+       char *option;
 
        option = po_get(options, "addr");
-       if (option) {
-               nfs_server.saddr.sin_family = AF_INET;
-               if (!inet_aton((const char *)option, &nfs_server.saddr.sin_addr))
-                       goto err;
-       } else
-               goto err;
+       if (option == NULL)
+               return 0;
+       if (!nfs_string_to_sockaddr(option, nfs_saddr, nfs_salen))
+               return 0;
 
        option = po_get(options, "mountaddr");
-       if (option) {
-               mnt_server.saddr.sin_family = AF_INET;
-               if (!inet_aton((const char *)option, &mnt_server.saddr.sin_addr))
-                       goto err;
-       } else
-               memcpy(&mnt_server.saddr, &nfs_server.saddr,
-                               sizeof(mnt_server.saddr));
-
-       option = po_get(options, "mountport");
-       if (option)
-               mnt_server.pmap.pm_port = atoi(option);
-       mnt_server.pmap.pm_prog = MOUNTPROG;
-       option = po_get(options, "mountprog");
-       if (option)
-               mnt_server.pmap.pm_prog = atoi(option);
-       option = po_get(options, "mountvers");
-       if (option)
-               mnt_server.pmap.pm_vers = atoi(option);
-
-       option = po_get(options, "port");
-       if (option) {
-               nfs_server.pmap.pm_port = atoi(option);
-               po_remove_all(options, "port");
-       }
-       nfs_server.pmap.pm_prog = NFS_PROGRAM;
-       option = po_get(options, "nfsprog");
-       if (option)
-               nfs_server.pmap.pm_prog = atoi(option);
-
-       option = po_get(options, "nfsvers");
-       if (option) {
-               nfs_server.pmap.pm_vers = atoi(option);
-               po_remove_all(options, "nfsvers");
-       }
-       option = po_get(options, "vers");
-       if (option) {
-               nfs_server.pmap.pm_vers = atoi(option);
-               po_remove_all(options, "vers");
-       }
-       option = po_get(options, "proto");
-       if (option) {
-               if (strcmp(option, "tcp") == 0) {
-                       nfs_server.pmap.pm_prot = IPPROTO_TCP;
-                       po_remove_all(options, "proto");
-               }
-               if (strcmp(option, "udp") == 0) {
-                       nfs_server.pmap.pm_prot = IPPROTO_UDP;
-                       po_remove_all(options, "proto");
-               }
-       }
-       p = po_rightmost(options, "tcp", "udp");
-       switch (p) {
-       case PO_KEY2_RIGHTMOST:
-               nfs_server.pmap.pm_prot = IPPROTO_UDP;
-               break;
-       case PO_KEY1_RIGHTMOST:
-               nfs_server.pmap.pm_prot = IPPROTO_TCP;
-               break;
-       }
-       po_remove_all(options, "tcp");
-       po_remove_all(options, "udp");
+       if (option == NULL) {
+               memcpy(mnt_saddr, nfs_saddr, *nfs_salen);
+               *mnt_salen = *nfs_salen;
+       } else if (!nfs_string_to_sockaddr(option, mnt_saddr, mnt_salen))
+               return 0;
 
-       if (!probe_bothports(&mnt_server, &nfs_server)) {
-               rpc_mount_errors("rpcbind", 0, 0);
-               goto err;
-       }
+       return 1;
+}
+
+static int nfs_construct_new_options(struct mount_options *options,
+                                    struct pmap *nfs_pmap,
+                                    struct pmap *mnt_pmap)
+{
+       char new_option[64];
+
+       po_remove_all(options, "nfsprog");
+       po_remove_all(options, "mountprog");
 
+       po_remove_all(options, "v2");
+       po_remove_all(options, "v3");
+       po_remove_all(options, "vers");
+       po_remove_all(options, "nfsvers");
        snprintf(new_option, sizeof(new_option) - 1,
-                "nfsvers=%lu", nfs_server.pmap.pm_vers);
+                "vers=%lu", nfs_pmap->pm_vers);
        if (po_append(options, new_option) == PO_FAILED)
-               goto err;
+               return 0;
 
-       if (nfs_server.pmap.pm_prot == IPPROTO_TCP)
+       po_remove_all(options, "proto");
+       po_remove_all(options, "udp");
+       po_remove_all(options, "tcp");
+       switch (nfs_pmap->pm_prot) {
+       case IPPROTO_TCP:
                snprintf(new_option, sizeof(new_option) - 1,
                         "proto=tcp");
-       else
+               if (po_append(options, new_option) == PO_FAILED)
+                       return 0;
+               break;
+       case IPPROTO_UDP:
                snprintf(new_option, sizeof(new_option) - 1,
                         "proto=udp");
-       if (po_append(options, new_option) == PO_FAILED)
-               goto err;
+               if (po_append(options, new_option) == PO_FAILED)
+                       return 0;
+               break;
+       }
 
-       if (nfs_server.pmap.pm_port != NFS_PORT) {
+       po_remove_all(options, "port");
+       if (nfs_pmap->pm_port != NFS_PORT) {
                snprintf(new_option, sizeof(new_option) - 1,
-                        "port=%lu", nfs_server.pmap.pm_port);
+                        "port=%lu", nfs_pmap->pm_port);
                if (po_append(options, new_option) == PO_FAILED)
-                       goto err;
+                       return 0;
+       }
+
+       po_remove_all(options, "mountvers");
+       snprintf(new_option, sizeof(new_option) - 1,
+                "mountvers=%lu", mnt_pmap->pm_vers);
+       if (po_append(options, new_option) == PO_FAILED)
+               return 0;
 
+       po_remove_all(options, "mountproto");
+       switch (mnt_pmap->pm_prot) {
+       case IPPROTO_TCP:
+               snprintf(new_option, sizeof(new_option) - 1,
+                        "mountproto=tcp");
+               if (po_append(options, new_option) == PO_FAILED)
+                       return 0;
+               break;
+       case IPPROTO_UDP:
+               snprintf(new_option, sizeof(new_option) - 1,
+                        "mountproto=udp");
+               if (po_append(options, new_option) == PO_FAILED)
+                       return 0;
+               break;
        }
 
-       return options;
+       po_remove_all(options, "mountport");
+       snprintf(new_option, sizeof(new_option) - 1,
+                "mountport=%lu", mnt_pmap->pm_port);
+       if (po_append(options, new_option) == PO_FAILED)
+               return 0;
 
-err:
-       po_destroy(options);
-       return NULL;
+       return 1;
 }
 
 /*
- * Retry an NFS mount that failed because the requested service isn't
- * available on the server.
+ * Reconstruct the mount option string based on a portmapper probe
+ * of the server.  Returns one if the server's portmapper returned
+ * something we can use, otherwise zero.
  *
- * Returns 1 if successful.  Otherwise, returns zero.
- * "errno" is set to reflect the individual error.
+ * To handle version and transport protocol fallback properly, we
+ * need to parse some of the mount options in order to set up a
+ * portmap probe.  Mount options that nfs_rewrite_pmap_mount_options()
+ * doesn't recognize are left alone.
  *
- * Side effect: If the retry is successful, both 'options' and
- * 'extra_opts' are updated to reflect the mount options that worked.
- * If the retry fails, 'options' and 'extra_opts' are left unchanged.
+ * Returns TRUE if rewriting was successful; otherwise
+ * FALSE is returned if some failure occurred.
  */
-static int retry_nfsmount(const char *spec, const char *node,
-                       int flags, struct mount_options *options,
-                       int fake, char **extra_opts)
+static int
+nfs_rewrite_pmap_mount_options(struct mount_options *options)
 {
-       struct mount_options *retry_options;
-       char *retry_str = NULL;
+       struct sockaddr_storage nfs_address;
+       struct sockaddr *nfs_saddr = (struct sockaddr *)&nfs_address;
+       socklen_t nfs_salen = sizeof(nfs_address);
+       struct pmap nfs_pmap;
+       struct sockaddr_storage mnt_address;
+       struct sockaddr *mnt_saddr = (struct sockaddr *)&mnt_address;
+       socklen_t mnt_salen = sizeof(mnt_address);
+       struct pmap mnt_pmap;
+       char *option;
 
-       retry_options = rewrite_mount_options(*extra_opts);
-       if (!retry_options) {
-               errno = EIO;
+       /*
+        * Skip option negotiation for proto=rdma mounts.
+        */
+       option = po_get(options, "proto");
+       if (option && strcmp(option, "rdma") == 0)
+               goto out;
+
+       /*
+        * Extract just the options needed to contact server.
+        * Bail now if any of these have bad values.
+        */
+       if (!nfs_extract_server_addresses(options, nfs_saddr, &nfs_salen,
+                                               mnt_saddr, &mnt_salen)) {
+               errno = EINVAL;
+               return 0;
+       }
+       if (!nfs_options2pmap(options, &nfs_pmap, &mnt_pmap)) {
+               errno = EINVAL;
                return 0;
        }
 
-       if (po_join(retry_options, &retry_str) == PO_FAILED) {
-               po_destroy(retry_options);
-               errno = EIO;
+       /*
+        * The kernel NFS client doesn't support changing the RPC
+        * program number for these services, so force the value of
+        * these fields before probing the server's ports.
+        */
+       nfs_pmap.pm_prog = NFS_PROGRAM;
+       mnt_pmap.pm_prog = MOUNTPROG;
+
+       /*
+        * If the server's rpcbind service isn't available, we can't
+        * negotiate.  Bail now if we can't contact it.
+        */
+       if (!nfs_probe_bothports(mnt_saddr, mnt_salen, &mnt_pmap,
+                                nfs_saddr, nfs_salen, &nfs_pmap)) {
+               errno = ESPIPE;
                return 0;
        }
 
-       if (verbose)
-               printf(_("%s: text-based options (retry): '%s'\n"),
-                       progname, retry_str);
-
-       if (!mount(spec, node, "nfs",
-                               flags & ~(MS_USER|MS_USERS), retry_str)) {
-               free(*extra_opts);
-               *extra_opts = retry_str;
-               po_replace(options, retry_options);
-               return 1;
+       if (!nfs_construct_new_options(options, &nfs_pmap, &mnt_pmap)) {
+               errno = EINVAL;
+               return 0;
        }
 
-       po_destroy(retry_options);
-       free(retry_str);
-       return 0;
+out:
+       errno = 0;
+       return 1;
 }
 
 /*
- * Attempt an NFSv2/3 mount via a mount(2) system call.  If the kernel
- * claims the requested service isn't supported on the server, probe
- * the server to see what's supported, rewrite the mount options,
- * and retry the request.
+ * Do the mount(2) system call.
  *
- * Returns 1 if successful.  Otherwise, returns zero.
+ * Returns TRUE if successful, otherwise FALSE.
  * "errno" is set to reflect the individual error.
- *
- * Side effect: If the retry is successful, both 'options' and
- * 'extra_opts' are updated to reflect the mount options that worked.
- * If the retry fails, 'options' and 'extra_opts' are left unchanged.
  */
-static int try_nfs23mount(const char *spec, const char *node,
-                         int flags, struct mount_options *options,
-                         int fake, char **extra_opts)
+static int nfs_sys_mount(struct nfsmount_info *mi, struct mount_options *opts)
 {
-       if (po_join(options, extra_opts) == PO_FAILED) {
+       char *options = NULL;
+       int result;
+
+       if (po_join(opts, &options) == PO_FAILED) {
                errno = EIO;
                return 0;
        }
 
        if (verbose)
-               printf(_("%s: text-based options: '%s'\n"),
-                       progname, *extra_opts);
+               printf(_("%s: trying text-based options '%s'\n"),
+                       progname, options);
 
-       if (fake)
+       if (mi->fake)
                return 1;
 
-       if (!mount(spec, node, "nfs",
-                               flags & ~(MS_USER|MS_USERS), *extra_opts))
-               return 1;
+       result = mount(mi->spec, mi->node, mi->type,
+                       mi->flags & ~(MS_USER|MS_USERS), options);
+       if (verbose && result) {
+               int save = errno;
+               nfs_error(_("%s: mount(2): %s"), progname, strerror(save));
+               errno = save;
+       }
+       return !result;
+}
+
+/*
+ * For "-t nfs vers=2" or "-t nfs vers=3" mounts.
+ */
+static int nfs_try_mount_v3v2(struct nfsmount_info *mi)
+{
+       struct mount_options *options = po_dup(mi->options);
+       int result = 0;
+
+       if (!options) {
+               errno = ENOMEM;
+               return result;
+       }
+
+       if (!nfs_fix_mounthost_option(options)) {
+               errno = EINVAL;
+               goto out_fail;
+       }
+       if (!mi->fake && !nfs_verify_lock_option(options)) {
+               errno = EINVAL;
+               goto out_fail;
+       }
 
        /*
-        * The kernel returns EOPNOTSUPP if the RPC bind failed,
-        * and EPROTONOSUPPORT if the version isn't supported.
+        * Options we negotiate below may be stale by the time this
+        * file system is unmounted.  In order to force umount.nfs
+        * to renegotiate with the server, only write the user-
+        * specified options, and not negotiated options, to /etc/mtab.
         */
-       if (errno != EOPNOTSUPP && errno != EPROTONOSUPPORT)
-               return 0;
+       if (po_join(options, mi->extra_opts) == PO_FAILED) {
+               errno = ENOMEM;
+               goto out_fail;
+       }
+
+       if (!nfs_rewrite_pmap_mount_options(options))
+               goto out_fail;
+
+       result = nfs_sys_mount(mi, options);
+
+out_fail:
+       po_destroy(options);
+       return result;
+}
+
+/*
+ * For "-t nfs -o vers=4" or "-t nfs4" mounts.
+ */
+static int nfs_try_mount_v4(struct nfsmount_info *mi)
+{
+       struct sockaddr *sap = (struct sockaddr *)&mi->address;
+       struct mount_options *options = po_dup(mi->options);
+       int result = 0;
+
+       if (!options) {
+               errno = ENOMEM;
+               return result;
+       }
+
+       if (mi->version == 0) {
+               if (po_contains(options, "mounthost") ||
+                       po_contains(options, "mountaddr") ||
+                       po_contains(options, "mountvers") ||
+                       po_contains(options, "mountproto")) {
+               /*
+                * Since these mountd options are set assume version 3
+                * is wanted so error out with EPROTONOSUPPORT so the
+                * protocol negation starts with v3.
+                */
+                       errno = EPROTONOSUPPORT;
+                       goto out_fail;
+               }
+               if (po_append(options, "vers=4") == PO_FAILED) {
+                       errno = EINVAL;
+                       goto out_fail;
+               }
+       }
+
+       if (!nfs_append_clientaddr_option(sap, mi->salen, options)) {
+               errno = EINVAL;
+               goto out_fail;
+       }
 
-       return retry_nfsmount(spec, node, flags, options, fake, extra_opts);
+       /*
+        * Update option string to be recorded in /etc/mtab.
+        */
+       if (po_join(options, mi->extra_opts) == PO_FAILED) {
+               errno = ENOMEM;
+               goto out_fail;
+       }
+
+       result = nfs_sys_mount(mi, options);
+
+out_fail:
+       po_destroy(options);
+       return result;
 }
 
 /*
- * Attempt an NFS v4 mount via a mount(2) system call.
+ * This is a single pass through the fg/bg loop.
  *
- * Returns 1 if successful.  Otherwise, returns zero.
+ * Returns TRUE if successful, otherwise FALSE.
  * "errno" is set to reflect the individual error.
  */
-static int try_nfs4mount(const char *spec, const char *node,
-                        int flags, struct mount_options *options,
-                        int fake, char **extra_opts)
+static int nfs_try_mount(struct nfsmount_info *mi)
 {
-       if (po_join(options, extra_opts) == PO_FAILED) {
+       int result = 0;
+
+       switch (mi->version) {
+       case 0:
+               if (linux_version_code() > MAKE_VERSION(2, 6, 31)) {
+                       errno = 0;
+                       result = nfs_try_mount_v4(mi);
+                       if (errno != EPROTONOSUPPORT) {
+                               /* 
+                                * To deal with legacy Linux servers that don't
+                                * automatically export a pseudo root, retry
+                                * ENOENT errors using version 3
+                                */
+                               if (errno != ENOENT)
+                                       break;
+                       }
+               }
+       case 2:
+       case 3:
+               result = nfs_try_mount_v3v2(mi);
+               break;
+       case 4:
+               result = nfs_try_mount_v4(mi);
+               break;
+       default:
                errno = EIO;
-               return 0;
        }
 
+       return result;
+}
+
+/*
+ * Distinguish between permanent and temporary errors.
+ *
+ * Basically, we retry if communication with the server has
+ * failed so far, but fail immediately if there is a local
+ * error (like a bad mount option).
+ *
+ * ESTALE is also a temporary error because some servers
+ * return ESTALE when a share is temporarily offline.
+ *
+ * Returns 1 if we should fail immediately, or 0 if we
+ * should retry.
+ */
+static int nfs_is_permanent_error(int error)
+{
+       switch (error) {
+       case ESTALE:
+       case ETIMEDOUT:
+       case ECONNREFUSED:
+               return 0;       /* temporary */
+       default:
+               return 1;       /* permanent */
+       }
+}
+
+/*
+ * Handle "foreground" NFS mounts.
+ *
+ * Retry the mount request for as long as the 'retry=' option says.
+ *
+ * Returns a valid mount command exit code.
+ */
+static int nfsmount_fg(struct nfsmount_info *mi)
+{
+       unsigned int secs = 1;
+       time_t timeout;
+
+       timeout = nfs_parse_retry_option(mi->options,
+                                        NFS_DEF_FG_TIMEOUT_MINUTES);
        if (verbose)
-               printf(_("%s: text-based options: '%s'\n"),
-                       progname, *extra_opts);
+               printf(_("%s: timeout set for %s"),
+                       progname, ctime(&timeout));
 
-       if (fake)
-               return 1;
+       for (;;) {
+               if (nfs_try_mount(mi))
+                       return EX_SUCCESS;
 
-       if (!mount(spec, node, "nfs4",
-                               flags & ~(MS_USER|MS_USERS), *extra_opts))
-               return 1;
-       return 0;
+               if (nfs_is_permanent_error(errno))
+                       break;
+
+               if (time(NULL) > timeout) {
+                       errno = ETIMEDOUT;
+                       break;
+               }
+
+               if (errno != ETIMEDOUT) {
+                       if (sleep(secs))
+                               break;
+                       secs <<= 1;
+                       if (secs > 10)
+                               secs = 10;
+               }
+       };
+
+       mount_error(mi->spec, mi->node, errno);
+       return EX_FAIL;
 }
 
 /*
- * Try the mount(2) system call.
+ * Handle "background" NFS mount [first try]
  *
- * Returns 1 if successful.  Otherwise, returns zero.
- * "errno" is set to reflect the individual error.
+ * Returns a valid mount command exit code.
+ *
+ * EX_BG should cause the caller to fork and invoke nfsmount_child.
+ */
+static int nfsmount_parent(struct nfsmount_info *mi)
+{
+       if (nfs_try_mount(mi))
+               return EX_SUCCESS;
+
+       if (nfs_is_permanent_error(errno)) {
+               mount_error(mi->spec, mi->node, errno);
+               return EX_FAIL;
+       }
+
+       sys_mount_errors(mi->hostname, errno, 1, 1);
+       return EX_BG;
+}
+
+/*
+ * Handle "background" NFS mount [retry daemon]
+ *
+ * Returns a valid mount command exit code: EX_SUCCESS if successful,
+ * EX_FAIL if a failure occurred.  There's nothing to catch the
+ * error return, though, so we use sys_mount_errors to log the
+ * failure.
  */
-static int try_mount(const char *spec, const char *node, const char *type,
-                    int flags, struct mount_options *options, int fake,
-                    char **extra_opts)
+static int nfsmount_child(struct nfsmount_info *mi)
 {
-       if (strncmp(type, "nfs4", 4) == 0)
-               return try_nfs4mount(spec, node, flags,
-                                       options, fake, extra_opts);
+       unsigned int secs = 1;
+       time_t timeout;
+
+       timeout = nfs_parse_retry_option(mi->options,
+                                        NFS_DEF_BG_TIMEOUT_MINUTES);
+
+       for (;;) {
+               if (sleep(secs))
+                       break;
+               secs <<= 1;
+               if (secs > 120)
+                       secs = 120;
+
+               if (nfs_try_mount(mi))
+                       return EX_SUCCESS;
+
+               if (nfs_is_permanent_error(errno))
+                       break;
+
+               if (time(NULL) > timeout)
+                       break;
+
+               sys_mount_errors(mi->hostname, errno, 1, 1);
+       };
+
+       sys_mount_errors(mi->hostname, errno, 1, 0);
+       return EX_FAIL;
+}
+
+/*
+ * Handle "background" NFS mount
+ *
+ * Returns a valid mount command exit code.
+ */
+static int nfsmount_bg(struct nfsmount_info *mi)
+{
+       if (!mi->child)
+               return nfsmount_parent(mi);
+       else
+               return nfsmount_child(mi);
+}
+
+/*
+ * Process mount options and try a mount system call.
+ *
+ * Returns a valid mount command exit code.
+ */
+static const char *nfs_background_opttbl[] = {
+       "bg",
+       "fg",
+       NULL,
+};
+
+static int nfsmount_start(struct nfsmount_info *mi)
+{
+       if (!nfs_validate_options(mi))
+               return EX_FAIL;
+
+       if (po_rightmost(mi->options, nfs_background_opttbl) == 0)
+               return nfsmount_bg(mi);
        else
-               return try_nfs23mount(spec, node, flags,
-                                       options, fake, extra_opts);
+               return nfsmount_fg(mi);
 }
 
 /**
@@ -517,47 +865,24 @@ static int try_mount(const char *spec, const char *node, const char *type,
 int nfsmount_string(const char *spec, const char *node, const char *type,
                    int flags, char **extra_opts, int fake, int child)
 {
-       struct mount_options *options = NULL;
-       struct sockaddr_in saddr;
-       char *hostname;
-       int err, retval = EX_FAIL;
-
-       if (!parse_devname(spec, &hostname))
-               goto out;
-       err = fill_ipv4_sockaddr(hostname, &saddr);
-       free(hostname);
-       if (!err)
-               goto out;
-
-       options = po_split(*extra_opts);
-       if (!options) {
+       struct nfsmount_info mi = {
+               .spec           = spec,
+               .node           = node,
+               .type           = type,
+               .extra_opts     = extra_opts,
+               .flags          = flags,
+               .fake           = fake,
+               .child          = child,
+       };
+       int retval = EX_FAIL;
+
+       mi.options = po_split(*extra_opts);
+       if (mi.options) {
+               retval = nfsmount_start(&mi);
+               po_destroy(mi.options);
+       } else
                nfs_error(_("%s: internal option parsing error"), progname);
-               goto out;
-       }
-
-       if (!set_mandatory_options(type, &saddr, options))
-               goto out;
 
-       if (po_join(options, extra_opts) == PO_FAILED) {
-               nfs_error(_("%s: internal option parsing error"), progname);
-               goto out;
-       }
-
-       if (verbose)
-               printf(_("%s: text-based options: '%s'\n"),
-                       progname, *extra_opts);
-
-       if (!fake) {
-               if (mount(spec, node, type,
-                               flags & ~(MS_USER|MS_USERS), *extra_opts)) {
-                       mount_error(spec, node, errno);
-                       goto out;
-               }
-       }
-
-       retval = EX_SUCCESS;
-
-out:
-       po_destroy(options);
+       free(mi.hostname);
        return retval;
 }