]> git.decadent.org.uk Git - nfs-utils.git/blobdiff - utils/mount/stropts.c
Use the default protocol and version values, when they
[nfs-utils.git] / utils / mount / stropts.c
index b089d1bc88dfde96e6baaf0a694be69761cd399f..ceefdb0fc24cecb5a5215db809fbe01fece76251 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 retry_opt = 10000;          /* 10,000 minutes ~= 1 week */
-static int bg_opt = 0;
-static int addr_opt = 0;
-static int ca_opt = 0;
+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 */
 
-static int parse_devname(const char *spec, char **hostname)
-{
-       int ret = 0;
-       char *dev, *pathname, *s;
+       struct mount_options    *options;       /* parsed mount options */
+       char                    **extra_opts;   /* string for /etc/mtab */
 
-       dev = xstrdup(spec);
+       unsigned long           version;        /* NFS version */
+       int                     flags,          /* MS_ flags */
+                               fake,           /* actually do the mount? */
+                               child;          /* forked bg child? */
+};
 
-       if (!(pathname = strchr(dev, ':'))) {
-               nfs_error(_("%s: remote share not in 'host:dir' format"),
-                               progname);
-               goto out;
+/*
+ * 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;
+
+       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;
        }
-       *pathname = '\0';
-       pathname++;
 
-       /*
-        * 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;
-       }
+       return time(NULL) + (time_t)(timeout_minutes * 60);
+}
 
-       /*
-        * Ignore all but first hostname in replicated mounts
-        * until they can be fully supported. (mack@sgi.com)
-        */
-       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;
-       }
+/*
+ * 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)
+{
+       char address[NI_MAXHOST];
+       char new_option[512];
+       int len;
 
-       ret = 1;
+       if (!nfs_present_sockaddr(sap, salen, address, sizeof(address)))
+               goto out_err;
 
-out:
-       free(dev);
-       return ret;
+       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;
+
+       return 1;
+
+out_err:
+       nfs_error(_("%s: failed to construct %s option"), progname, keyword);
+       return 0;
+}
+
+/*
+ * Append the 'addr=' option to the options string to pass a resolved
+ * server address to the kernel.  After a successful mount, this address
+ * is also added to /etc/mtab for use when unmounting.
+ *
+ * If 'addr=' is already present, we strip it out.  This prevents users
+ * from setting a bogus 'addr=' option themselves, and also allows bg
+ * retries to recompute the server's address, in case it has changed.
+ *
+ * Returns 1 if 'addr=' option appended successfully;
+ * otherwise zero.
+ */
+static int nfs_append_addr_option(const struct sockaddr *sap,
+                                 socklen_t salen,
+                                 struct mount_options *options)
+{
+       po_remove_all(options, "addr");
+       return nfs_append_generic_address_option(sap, salen, "addr", options);
 }
 
-static int fill_ipv4_sockaddr(const char *hostname, struct sockaddr_in *addr)
+/*
+ * Called to discover our address and append an appropriate 'clientaddr='
+ * option to the options string.
+ *
+ * Returns 1 if 'clientaddr=' option created successfully or if
+ * 'clientaddr=' option is already present; otherwise zero.
+ */
+static int nfs_append_clientaddr_option(const struct sockaddr *sap,
+                                       socklen_t salen,
+                                       struct mount_options *options)
 {
-       struct hostent *hp;
-       addr->sin_family = AF_INET;
+       struct sockaddr_storage dummy;
+       struct sockaddr *my_addr = (struct sockaddr *)&dummy;
+       socklen_t my_len = sizeof(dummy);
 
-       if (inet_aton(hostname, &addr->sin_addr))
+       if (po_contains(options, "clientaddr") == PO_FOUND)
                return 1;
-       if ((hp = gethostbyname(hostname)) == NULL) {
-               nfs_error(_("%s: can't get address for %s\n"),
-                               progname, hostname);
+
+       nfs_callback_address(sap, salen, my_addr, &my_len);
+
+       return nfs_append_generic_address_option(my_addr, my_len,
+                                                       "clientaddr", options);
+}
+
+/*
+ * Resolve the 'mounthost=' hostname and append a new option using
+ * the resulting address.
+ */
+static int nfs_fix_mounthost_option(struct mount_options *options)
+{
+       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 (!nfs_name_to_address(mounthost, sap, &salen)) {
+               nfs_error(_("%s: unable to determine mount server's address"),
+                               progname);
                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);
+
+       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;
        }
-       memcpy(&addr->sin_addr, hp->h_addr, hp->h_length);
+
+       return 1;
+}
+
+static int nfs_append_sloppy_option(struct mount_options *options)
+{
+       if (!sloppy || linux_version_code() < MAKE_VERSION(2, 6, 27))
+               return 1;
+
+       if (po_append(options, "sloppy") == PO_FAILED)
+               return 0;
        return 1;
 }
 
 /*
- * XXX: This should really use the technique neil recently added
- * to get the address off the local end of a socket connected to
- * the server -- to get the right address to use on multi-homed
- * clients
+ * Set up mandatory non-version specific NFS mount options.
+ *
+ * Returns 1 if successful; otherwise zero.
  */
-static int get_my_ipv4addr(char *ip_addr, int len)
+static int nfs_validate_options(struct nfsmount_info *mi)
 {
-       char myname[1024];
-       struct sockaddr_in myaddr;
+       struct sockaddr *sap = (struct sockaddr *)&mi->address;
 
-       if (gethostname(myname, sizeof(myname))) {
-               nfs_error(_("%s: can't determine client address\n"),
-                               progname);
+       if (!nfs_parse_devname(mi->spec, &mi->hostname, NULL))
+               return 0;
+
+       mi->salen = sizeof(mi->address);
+       if (!nfs_name_to_address(mi->hostname, sap, &mi->salen))
                return 0;
+
+       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 (!fill_ipv4_sockaddr(myname, &myaddr))
+       /*
+        * Use the default value set in the config file when
+        * the version has not been explicitly set.
+        */
+       if (mi->version == 0 && config_default_vers) {
+               if (config_default_vers < 4)
+                       mi->version = config_default_vers;
+       }
+
+       if (!nfs_append_sloppy_option(mi->options))
                return 0;
 
-       snprintf(ip_addr, len, "%s", inet_ntoa(myaddr.sin_addr));
-       ip_addr[len - 1] = '\0';
+       if (!nfs_append_addr_option(sap, mi->salen, mi->options))
+               return 0;
 
        return 1;
 }
 
 /*
- * Walk through our mount options string, and indicate the presence
- * of 'bg', 'retry=', 'addr=', and 'clientaddr='.
+ * Get NFS/mnt server addresses from mount options
+ *
+ * Returns 1 and fills in @nfs_saddr, @nfs_salen, @mnt_saddr, and @mnt_salen
+ * if all goes well; otherwise zero.
  */
-static void extract_interesting_options(char *opts)
+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)
 {
-       char *opt, *opteq;
-       int val;
-
-       opts = xstrdup(opts);
-
-       for (opt = strtok(opts, ","); opt; opt = strtok(NULL, ",")) {
-               if ((opteq = strchr(opt, '='))) {
-                       val = atoi(opteq + 1);
-                       *opteq = '\0';
-                       if (strcmp(opt, "bg") == 0)
-                               bg_opt++;
-                       else if (strcmp(opt, "retry") == 0)
-                               retry_opt = val;
-                       else if (strcmp(opt, "addr") == 0)
-                               addr_opt++;
-                       else if (strcmp(opt, "clientaddr") == 0)
-                               ca_opt++;
-               } else {
-                       if (strcmp(opt, "bg") == 0)
-                               bg_opt++;
-               }
+       char *option;
+
+       option = po_get(options, "addr");
+       if (option == NULL)
+               return 0;
+       if (!nfs_string_to_sockaddr(option, nfs_saddr, nfs_salen))
+               return 0;
+
+       option = po_get(options, "mountaddr");
+       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;
+
+       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,
+                "vers=%lu", nfs_pmap->pm_vers);
+       if (po_append(options, new_option) == PO_FAILED)
+               return 0;
+
+       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");
+               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)
+                       return 0;
+               break;
+       }
+
+       po_remove_all(options, "port");
+       if (nfs_pmap->pm_port != NFS_PORT) {
+               snprintf(new_option, sizeof(new_option) - 1,
+                        "port=%lu", nfs_pmap->pm_port);
+               if (po_append(options, new_option) == PO_FAILED)
+                       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;
        }
 
-       free(opts);
+       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;
+
+       return 1;
 }
 
 /*
- * Append the 'addr=' option to the options string.  The server
- * address is added to /etc/mtab for use when unmounting.
+ * 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 'addr=' option created successfully;
- * 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 nfs_rewrite_pmap_mount_options()
+ * doesn't recognize are left alone.
+ *
+ * Returns TRUE if rewriting was successful; otherwise
+ * FALSE is returned if some failure occurred.
  */
-static int append_addr_opt(struct sockaddr_in *saddr, char **extra_opts)
+static int
+nfs_rewrite_pmap_mount_options(struct mount_options *options)
 {
-       static char new_opts[1024];
-       char *s, *old_opts;
-
-       s = inet_ntoa(saddr->sin_addr);
-       old_opts = *extra_opts;
-       if (!old_opts)
-               old_opts = "";
-       if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) {
-               nfs_error(_("%s: too many mount options\n"),
-                               progname);
+       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;
+
+       /*
+        * 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;
+       }
+
+       /*
+        * 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 (!nfs_construct_new_options(options, &nfs_pmap, &mnt_pmap)) {
+               errno = EINVAL;
                return 0;
        }
-       snprintf(new_opts, sizeof(new_opts), "%s%saddr=%s",
-                old_opts, *old_opts ? "," : "", s);
-       *extra_opts = xstrdup(new_opts);
 
+out:
+       errno = 0;
        return 1;
 }
 
 /*
- * Append the 'clientaddr=' option to the options string.
+ * Do the mount(2) system call.
  *
- * Returns 1 if 'clientaddr=' option created successfully;
- * otherwise zero.
+ * Returns TRUE if successful, otherwise FALSE.
+ * "errno" is set to reflect the individual error.
  */
-static int append_clientaddr_opt(struct sockaddr_in *saddr, char **extra_opts)
+static int nfs_sys_mount(struct nfsmount_info *mi, struct mount_options *opts)
 {
-       static char new_opts[2048], cbuf[256];
-       struct sockaddr_in my_addr;
+       char *options = NULL;
+       int result;
 
-       if (!get_client_address(saddr, &my_addr))
+       if (po_join(opts, &options) == PO_FAILED) {
+               errno = EIO;
                return 0;
+       }
 
-       if (strlen(*extra_opts) + 30 >= sizeof(new_opts)) {
-               nfs_error(_("%s: too many mount options"),
-                               progname);
-               return 0;
+       if (verbose)
+               printf(_("%s: trying text-based options '%s'\n"),
+                       progname, options);
+
+       if (mi->fake)
+               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;
        }
 
-       strcat(new_opts, *extra_opts);
+       if (!nfs_fix_mounthost_option(options)) {
+               errno = EINVAL;
+               goto out_fail;
+       }
+       if (!mi->fake && !nfs_verify_lock_option(options)) {
+               errno = EINVAL;
+               goto out_fail;
+       }
 
-       snprintf(cbuf, sizeof(cbuf) - 1, "%sclientaddr=%s",
-                       *extra_opts ? "," : "", inet_ntoa(my_addr.sin_addr));
+       /*
+        * 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 (po_join(options, mi->extra_opts) == PO_FAILED) {
+               errno = ENOMEM;
+               goto out_fail;
+       }
 
-       strcat(new_opts, cbuf);
+       if (!nfs_rewrite_pmap_mount_options(options))
+               goto out_fail;
 
-       *extra_opts = xstrdup(new_opts);
+       result = nfs_sys_mount(mi, options);
 
-       return 1;
+out_fail:
+       po_destroy(options);
+       return result;
 }
 
 /*
- * nfsmount_s - Mount an NFSv2 or v3 file system using C string options
- *
- * @spec:      C string hostname:path specifying remoteshare to mount
- * @node:      C string pathname of local mounted on directory
- * @flags:     MS_ style flags
- * @extra_opts:        pointer to C string containing fs-specific mount options
- *             (possibly also a return argument)
- * @fake:      flag indicating whether to carry out the whole operation
- * @bg:                one if this is a backgrounded mount attempt
- *
- * XXX: need to handle bg, fg, and retry options.
+ * For "-t nfs -o vers=4" or "-t nfs4" mounts.
  */
-int nfsmount_s(const char *spec, const char *node, int flags,
-               char **extra_opts, int fake, int bg)
+static int nfs_try_mount_v4(struct nfsmount_info *mi)
 {
-       struct sockaddr_in saddr;
-       char *hostname;
-       int err;
+       struct sockaddr *sap = (struct sockaddr *)&mi->address;
+       struct mount_options *options = po_dup(mi->options);
+       int result = 0;
 
-       if (!parse_devname(spec, &hostname))
-               return EX_FAIL;
-       err = fill_ipv4_sockaddr(hostname, &saddr);
-       free(hostname);
-       if (!err)
-               return EX_FAIL;
+       if (!options) {
+               errno = ENOMEM;
+               return result;
+       }
 
-       extract_interesting_options(*extra_opts);
+       if (mi->version == 0) {
+               if (po_append(options, "vers=4") == PO_FAILED) {
+                       errno = EINVAL;
+                       goto out_fail;
+               }
+       }
 
-       if (!bg && addr_opt) {
-               nfs_error(_("%s: Illegal option: 'addr='"), progname);
-               return EX_FAIL;
+       if (!nfs_append_clientaddr_option(sap, mi->salen, options)) {
+               errno = EINVAL;
+               goto out_fail;
+       }
+       /*
+        * Update option string to be recorded in /etc/mtab.
+        */
+       if (po_join(options, mi->extra_opts) == PO_FAILED) {
+               errno = ENOMEM;
+               return 0;
        }
 
-       if (!append_addr_opt(&saddr, extra_opts))
-               return EX_FAIL;
+       result = nfs_sys_mount(mi, options);
 
-       if (verbose)
-               printf(_("%s: text-based options: '%s'\n"),
-                       progname, *extra_opts);
-
-       if (!fake) {
-               if (mount(spec, node, "nfs",
-                               flags & ~(MS_USER|MS_USERS), *extra_opts)) {
-                       mount_error(spec, node, errno);
-                       return EX_FAIL;
+out_fail:
+       po_destroy(options);
+       return result;
+}
+
+/*
+ * This is a single pass through the fg/bg loop.
+ *
+ * Returns TRUE if successful, otherwise FALSE.
+ * "errno" is set to reflect the individual error.
+ */
+static int nfs_try_mount(struct nfsmount_info *mi)
+{
+       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)
+                               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;
 }
 
 /*
- * nfs4mount_s - Mount an NFSv4 file system using C string options
+ * Distinguish between permanent and temporary errors.
  *
- * @spec:      C string hostname:path specifying remoteshare to mount
- * @node:      C string pathname of local mounted on directory
- * @flags:     MS_ style flags
- * @extra_opts:        pointer to C string containing fs-specific mount options
- *             (possibly also a return argument)
- * @fake:      flag indicating whether to carry out the whole operation
- * @child:     one if this is a backgrounded mount
+ * 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).
  *
- * XXX: need to handle bg, fg, and retry options.
+ * 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.
  */
-int nfs4mount_s(const char *spec, const char *node, int flags,
-               char **extra_opts, int fake, int child)
+static int nfs_is_permanent_error(int error)
 {
-       struct sockaddr_in saddr;
-       char *hostname;
-       int err;
+       switch (error) {
+       case ESTALE:
+       case ETIMEDOUT:
+       case ECONNREFUSED:
+               return 0;       /* temporary */
+       default:
+               return 1;       /* permanent */
+       }
+}
 
-       if (!parse_devname(spec, &hostname))
-               return EX_FAIL;
-       err = fill_ipv4_sockaddr(hostname, &saddr);
-       free(hostname);
-       if (!err)
-               return EX_FAIL;
+/*
+ * 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;
 
-       extract_interesting_options(*extra_opts);
+       timeout = nfs_parse_retry_option(mi->options,
+                                        NFS_DEF_FG_TIMEOUT_MINUTES);
+       if (verbose)
+               printf(_("%s: timeout set for %s"),
+                       progname, ctime(&timeout));
 
-       if (addr_opt) {
-               nfs_error(_("%s: Illegal option: 'addr='"), progname);
-               return EX_FAIL;
-       }
+       for (;;) {
+               if (nfs_try_mount(mi))
+                       return EX_SUCCESS;
+
+               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;
+}
 
-       if (ca_opt) {
-               nfs_error(_("%s: Illegal option: 'clientaddr='"), progname);
+/*
+ * Handle "background" NFS mount [first try]
+ *
+ * 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;
        }
 
-       if (!append_addr_opt(&saddr, extra_opts))
-               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 nfsmount_child(struct nfsmount_info *mi)
+{
+       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,
+};
 
-       if (!append_clientaddr_opt(&saddr, extra_opts))
+static int nfsmount_start(struct nfsmount_info *mi)
+{
+       if (!nfs_validate_options(mi))
                return EX_FAIL;
 
-       if (verbose)
-               printf(_("%s: text-based options: '%s'\n"),
-                       progname, *extra_opts);
-
-       if (!fake) {
-               if (mount(spec, node, "nfs4",
-                               flags & ~(MS_USER|MS_USERS), *extra_opts)) {
-                       mount_error(spec, node, errno);
-                       return EX_FAIL;
-               }
-       }
+       if (po_rightmost(mi->options, nfs_background_opttbl) == 0)
+               return nfsmount_bg(mi);
+       else
+               return nfsmount_fg(mi);
+}
 
-       return 0;
+/**
+ * nfsmount_string - Mount an NFS file system using C string options
+ * @spec: C string specifying remote share to mount ("hostname:path")
+ * @node: C string pathname of local mounted-on directory
+ * @type: C string that represents file system type ("nfs" or "nfs4")
+ * @flags: MS_ style mount flags
+ * @extra_opts:        pointer to C string containing fs-specific mount options
+ *             (input and output argument)
+ * @fake: flag indicating whether to carry out the whole operation
+ * @child: one if this is a mount daemon (bg)
+ */
+int nfsmount_string(const char *spec, const char *node, const char *type,
+                   int flags, char **extra_opts, int fake, int child)
+{
+       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);
+
+       free(mi.hostname);
+       return retval;
 }