X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=537a924198fb263d353f71af90b59ccd8cb394ea;hp=f73521f2c7812e199b6c6ab37b26d1aa1b9bad47;hb=39003947436f6676096e1fec3d3f09c95024d0a6;hpb=46572b00147b2ed5722ba4167073e7c2eb42ad74

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index f73521f..537a924 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -40,6 +40,7 @@
 #include "stropts.h"
 #include "error.h"
 #include "network.h"
+#include "parse_opt.h"
 
 #ifdef HAVE_RPCSVC_NFS_PROT_H
 #include <rpcsvc/nfs_prot.h>
@@ -234,6 +235,60 @@ static int append_clientaddr_opt(struct sockaddr_in *saddr, char **extra_opts)
 	return 1;
 }
 
+/*
+ * 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 append_addr_option(struct sockaddr_in *saddr,
+			   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;
+}
+
+/*
+ * 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 append_clientaddr_option(struct sockaddr_in *saddr,
+				    struct mount_options *options)
+{
+	struct sockaddr_in my_addr;
+	char new_option[32];
+
+	if (po_contains(options, "clientaddr") == PO_SUCCEEDED)
+		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));
+
+	if (po_append(options, new_option) == PO_SUCCEEDED)
+		return 1;
+	return 0;
+}
+
 /*
  * nfsmount_s - Mount an NFSv2 or v3 file system using C string options
  *
@@ -250,26 +305,31 @@ static int append_clientaddr_opt(struct sockaddr_in *saddr, char **extra_opts)
 int nfsmount_s(const char *spec, const char *node, int flags,
 		char **extra_opts, int fake, int child)
 {
+	struct mount_options *options = NULL;
 	struct sockaddr_in saddr;
 	char *hostname;
-	int err;
+	int err, retval = EX_FAIL;
 
 	if (!parse_devname(spec, &hostname))
-		return EX_FAIL;
+		goto out;
 	err = fill_ipv4_sockaddr(hostname, &saddr);
 	free(hostname);
 	if (!err)
-		return EX_FAIL;
-
-	extract_interesting_options(*extra_opts);
+		goto out;
 
-	if (!child && addr_opt) {
-		nfs_error(_("%s: Illegal option: 'addr='"), progname);
-		return EX_FAIL;
+	options = po_split(*extra_opts);
+	if (!options) {
+		nfs_error(_("%s: internal option parsing error"), progname);
+		goto out;
 	}
 
-	if (!append_addr_opt(&saddr, extra_opts))
-		return EX_FAIL;
+	if (!append_addr_option(&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"),
@@ -279,11 +339,15 @@ int nfsmount_s(const char *spec, const char *node, int flags,
 		if (mount(spec, node, "nfs",
 				flags & ~(MS_USER|MS_USERS), *extra_opts)) {
 			mount_error(spec, node, errno);
-			return EX_FAIL;
+			goto out;
 		}
 	}
 
-	return EX_SUCCESS;
+	retval = EX_SUCCESS;
+
+out:
+	po_destroy(options);
+	return retval;
 }
 
 /*
@@ -303,29 +367,34 @@ int nfsmount_s(const char *spec, const char *node, int flags,
 int nfs4mount_s(const char *spec, const char *node, int flags,
 		char **extra_opts, int fake, int child)
 {
+	struct mount_options *options = NULL;
 	struct sockaddr_in saddr;
 	char *hostname;
-	int err;
+	int err, retval = EX_FAIL;
 
 	if (!parse_devname(spec, &hostname))
-		return EX_FAIL;
+		goto out;
 	err = fill_ipv4_sockaddr(hostname, &saddr);
 	free(hostname);
 	if (!err)
-		return EX_FAIL;
-
-	extract_interesting_options(*extra_opts);
+		goto out;
 
-	if (addr_opt) {
-		nfs_error(_("%s: Illegal option: 'addr='"), progname);
-		return EX_FAIL;
+	options = po_split(*extra_opts);
+	if (!options) {
+		nfs_error(_("%s: internal option parsing error"), progname);
+		goto out;
 	}
 
-	if (!append_addr_opt(&saddr, extra_opts))
-		return EX_FAIL;
+	if (!append_addr_option(&saddr, options))
+		goto out;
+
+	if (!append_clientaddr_option(&saddr, options))
+		goto out;
 
-	if (!ca_opt && !append_clientaddr_opt(&saddr, extra_opts))
-		return EX_FAIL;
+	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"),
@@ -335,9 +404,13 @@ int nfs4mount_s(const char *spec, const char *node, int flags,
 		if (mount(spec, node, "nfs4",
 				flags & ~(MS_USER|MS_USERS), *extra_opts)) {
 			mount_error(spec, node, errno);
-			return EX_FAIL;
+			goto out;
 		}
 	}
 
-	return EX_SUCCESS;
+	retval = EX_SUCCESS;
+
+out:
+	po_destroy(options);
+	return retval;
 }