X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=a0b9e7fdf80a0f8967bda37c05b1ee34444769a0;hp=6560f1ce37f9d713ce923261bcef5ed83b7a24f8;hb=2498a68b1bec01d0ee8a63962b314140e8289036;hpb=987ee0e340a413c3bf3187084df9834eefb37bb9

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 6560f1c..a0b9e7f 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -45,6 +45,7 @@
 #include "parse_opt.h"
 #include "version.h"
 #include "parse_dev.h"
+#include "conffile.h"
 
 #ifndef NFS_PROGRAM
 #define NFS_PROGRAM	(100003)
@@ -80,15 +81,37 @@ struct nfsmount_info {
 				*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 */
 
 	struct mount_options	*options;	/* parsed mount options */
 	char			**extra_opts;	/* string for /etc/mtab */
 
+	unsigned long		version;	/* NFS version */
 	int			flags,		/* MS_ flags */
 				fake,		/* actually do the mount? */
 				child;		/* forked bg child? */
 };
 
+#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;
+	/*
+	 * 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;
+	}
+}
+#else
+inline void nfs_default_version(struct nfsmount_info *mi) {}
+#endif /* MOUNT_CONFIG */
+
 /*
  * Obtain a retry timeout value based on the value of the "retry=" option.
  *
@@ -130,12 +153,14 @@ static int nfs_append_generic_address_option(const struct sockaddr *sap,
 {
 	char address[NI_MAXHOST];
 	char new_option[512];
+	int len;
 
 	if (!nfs_present_sockaddr(sap, salen, address, sizeof(address)))
 		goto out_err;
 
-	if (snprintf(new_option, sizeof(new_option), "%s=%s",
-					keyword, address) >= sizeof(new_option))
+	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)
@@ -253,37 +278,66 @@ static int nfs_append_sloppy_option(struct mount_options *options)
 	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 NFS mount options.
+ * Set up mandatory non-version specific NFS mount options.
  *
  * Returns 1 if successful; otherwise zero.
  */
 static int nfs_validate_options(struct nfsmount_info *mi)
 {
-	struct sockaddr_storage dummy;
-	struct sockaddr *sap = (struct sockaddr *)&dummy;
-	socklen_t salen = sizeof(dummy);
+	struct sockaddr *sap = (struct sockaddr *)&mi->address;
 
 	if (!nfs_parse_devname(mi->spec, &mi->hostname, NULL))
 		return 0;
 
-	if (!nfs_name_to_address(mi->hostname, sap, &salen))
+	mi->salen = sizeof(mi->address);
+	if (!nfs_name_to_address(mi->hostname, sap, &mi->salen))
 		return 0;
 
-	if (strncmp(mi->type, "nfs4", 4) == 0) {
-		if (!nfs_append_clientaddr_option(sap, salen, mi->options))
-			return 0;
-	} else {
-		if (!nfs_fix_mounthost_option(mi->options))
-			return 0;
-		if (!mi->fake && !nfs_verify_lock_option(mi->options))
-			return 0;
-	}
+	if (!nfs_set_version(mi))
+		return 0;
 
 	if (!nfs_append_sloppy_option(mi->options))
 		return 0;
 
-	return nfs_append_addr_option(sap, salen, mi->options);
+	if (!nfs_append_addr_option(sap, mi->salen, mi->options))
+		return 0;
+
+	return 1;
 }
 
 /*
@@ -303,16 +357,14 @@ static int nfs_extract_server_addresses(struct mount_options *options,
 	option = po_get(options, "addr");
 	if (option == NULL)
 		return 0;
-	if (!nfs_string_to_sockaddr(option, strlen(option),
-						nfs_saddr, nfs_salen))
+	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, strlen(option),
-						mnt_saddr, mnt_salen))
+	} else if (!nfs_string_to_sockaddr(option, mnt_saddr, mnt_salen))
 		return 0;
 
 	return 1;
@@ -400,31 +452,25 @@ static int nfs_construct_new_options(struct mount_options *options,
  *
  * 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_mount_options()
+ * portmap probe.  Mount options that nfs_rewrite_pmap_mount_options()
  * doesn't recognize are left alone.
  *
- * Returns a new group of mount options if successful; otherwise
- * NULL is returned if some failure occurred.
+ * Returns TRUE if rewriting was successful; otherwise
+ * FALSE is returned if some failure occurred.
  */
-static struct mount_options *nfs_rewrite_mount_options(char *str)
+static int
+nfs_rewrite_pmap_mount_options(struct mount_options *options)
 {
-	struct mount_options *options;
 	struct sockaddr_storage nfs_address;
 	struct sockaddr *nfs_saddr = (struct sockaddr *)&nfs_address;
-	socklen_t nfs_salen;
+	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;
+	socklen_t mnt_salen = sizeof(mnt_address);
 	struct pmap mnt_pmap;
 	char *option;
 
-	options = po_split(str);
-	if (!options) {
-		errno = EFAULT;
-		return NULL;
-	}
-
 	/*
 	 * Skip option negotiation for proto=rdma mounts.
 	 */
@@ -439,11 +485,11 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
 	if (!nfs_extract_server_addresses(options, nfs_saddr, &nfs_salen,
 						mnt_saddr, &mnt_salen)) {
 		errno = EINVAL;
-		goto err;
+		return 0;
 	}
 	if (!nfs_options2pmap(options, &nfs_pmap, &mnt_pmap)) {
 		errno = EINVAL;
-		goto err;
+		return 0;
 	}
 
 	/*
@@ -461,36 +507,44 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
 	if (!nfs_probe_bothports(mnt_saddr, mnt_salen, &mnt_pmap,
 				 nfs_saddr, nfs_salen, &nfs_pmap)) {
 		errno = ESPIPE;
-		goto err;
+		return 0;
 	}
 
 	if (!nfs_construct_new_options(options, &nfs_pmap, &mnt_pmap)) {
 		errno = EINVAL;
-		goto err;
+		return 0;
 	}
 
 out:
 	errno = 0;
-	return options;
-
-err:
-	po_destroy(options);
-	return NULL;
+	return 1;
 }
 
 /*
  * Do the mount(2) system call.
  *
- * Returns 1 if successful, otherwise zero.
+ * Returns TRUE if successful, otherwise FALSE.
  * "errno" is set to reflect the individual error.
  */
-static int nfs_sys_mount(const struct nfsmount_info *mi, const char *type,
-			 const char *options)
+static int nfs_sys_mount(struct nfsmount_info *mi, struct mount_options *opts)
 {
+	char *options = NULL;
 	int result;
 
-	result = mount(mi->spec, mi->node, type,
-				mi->flags & ~(MS_USER|MS_USERS), options);
+	if (po_join(opts, &options) == PO_FAILED) {
+		errno = EIO;
+		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));
@@ -500,117 +554,138 @@ static int nfs_sys_mount(const struct nfsmount_info *mi, const char *type,
 }
 
 /*
- * Retry an NFS mount that failed because the requested service isn't
- * available on the server.
- *
- * Returns 1 if successful.  Otherwise, returns zero.
- * "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.
+ * For "-t nfs vers=2" or "-t nfs vers=3" mounts.
  */
-static int nfs_retry_nfs23mount(struct nfsmount_info *mi)
+static int nfs_try_mount_v3v2(struct nfsmount_info *mi)
 {
-	struct mount_options *retry_options;
-	char *retry_str = NULL;
-	char **extra_opts = mi->extra_opts;
+	struct mount_options *options = po_dup(mi->options);
+	int result = 0;
 
-	retry_options = nfs_rewrite_mount_options(*extra_opts);
-	if (!retry_options)
-		return 0;
+	if (!options) {
+		errno = ENOMEM;
+		return result;
+	}
 
-	if (po_join(retry_options, &retry_str) == PO_FAILED) {
-		po_destroy(retry_options);
-		errno = EIO;
-		return 0;
+	if (!nfs_fix_mounthost_option(options)) {
+		errno = EINVAL;
+		goto out_fail;
+	}
+	if (!mi->fake && !nfs_verify_lock_option(options)) {
+		errno = EINVAL;
+		goto out_fail;
 	}
 
-	if (verbose)
-		printf(_("%s: text-based options (retry): '%s'\n"),
-			progname, retry_str);
+	/*
+	 * 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;
+	}
 
-	if (mi->fake)
-		return 1;
+	if (!nfs_rewrite_pmap_mount_options(options))
+		goto out_fail;
 
-	if (!nfs_sys_mount(mi, "nfs", retry_str)) {
-		po_destroy(retry_options);
-		free(retry_str);
-		return 0;
-	}
+	result = nfs_sys_mount(mi, options);
 
-	free(*extra_opts);
-	*extra_opts = retry_str;
-	po_replace(mi->options, retry_options);
-	return 1;
+out_fail:
+	po_destroy(options);
+	return result;
 }
 
 /*
- * 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.
- *
- * Returns 1 if successful.  Otherwise, returns zero.
- * "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.
+ * For "-t nfs -o vers=4" or "-t nfs4" mounts.
  */
-static int nfs_try_nfs23mount(struct nfsmount_info *mi)
+static int nfs_try_mount_v4(struct nfsmount_info *mi)
 {
-	char **extra_opts = mi->extra_opts;
+	struct sockaddr *sap = (struct sockaddr *)&mi->address;
+	struct mount_options *options = po_dup(mi->options);
+	int result = 0;
 
-	if (po_join(mi->options, extra_opts) == PO_FAILED) {
-		errno = EIO;
-		return 0;
+	if (!options) {
+		errno = ENOMEM;
+		return result;
 	}
 
-	if (verbose)
-		printf(_("%s: text-based options: '%s'\n"),
-			progname, *extra_opts);
-
-	return nfs_retry_nfs23mount(mi);
-}
-
-/*
- * Attempt an NFS v4 mount via a mount(2) system call.
- *
- * Returns 1 if successful.  Otherwise, returns zero.
- * "errno" is set to reflect the individual error.
- */
-static int nfs_try_nfs4mount(struct nfsmount_info *mi)
-{
-	char **extra_opts = mi->extra_opts;
+	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 (po_join(mi->options, extra_opts) == PO_FAILED) {
-		errno = EIO;
-		return 0;
+	if (!nfs_append_clientaddr_option(sap, mi->salen, options)) {
+		errno = EINVAL;
+		goto out_fail;
 	}
 
-	if (verbose)
-		printf(_("%s: text-based options: '%s'\n"),
-			progname, *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;
+	}
 
-	if (mi->fake)
-		return 1;
+	result = nfs_sys_mount(mi, options);
 
-	return nfs_sys_mount(mi, "nfs4", *extra_opts);
+out_fail:
+	po_destroy(options);
+	return result;
 }
 
 /*
- * Perform either an NFSv2/3 mount, or an NFSv4 mount 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 nfs_try_mount(struct nfsmount_info *mi)
 {
-	if (strncmp(mi->type, "nfs4", 4) == 0)
-		return nfs_try_nfs4mount(mi);
-	else
-		return nfs_try_nfs23mount(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) {
+				/* 
+				 * 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 result;
 }
 
 /*