X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=b31b3a28e20cc7a0ed9a7c2422f7d33ce19364aa;hp=e3a3ac941d322c55950f7347a0b3f26154d71941;hb=7aa9d664abc948370b7c93d0e27d54859ae278fd;hpb=8034455d1fc4e315b54d100fd8138ce4c5c08471

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index e3a3ac9..b31b3a2 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -190,6 +190,30 @@ static int append_clientaddr_option(struct sockaddr_in *saddr,
 	return 0;
 }
 
+/*
+ * Called to resolve the 'mounthost=' hostname and append a new
+ * option using an IPv4 address.
+ */
+static int fix_up_mounthost_opt(struct mount_options *options)
+{
+	struct sockaddr_in maddr;
+	char *mounthost, new_option[32];
+
+	mounthost = po_get(options, "mounthost");
+	if (!mounthost)
+		return 1;
+
+	if (!fill_ipv4_sockaddr(mounthost, &maddr))
+		return 0;
+
+	snprintf(new_option, sizeof(new_option) - 1,
+			"mountaddr=%s", inet_ntoa(maddr.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
  *
@@ -227,6 +251,9 @@ int nfsmount_s(const char *spec, const char *node, int flags,
 	if (!append_addr_option(&saddr, options))
 		goto out;
 
+	if (!fix_up_mounthost_opt(options))
+		goto out;
+
 	if (po_join(options, extra_opts) == PO_FAILED) {
 		nfs_error(_("%s: internal option parsing error"), progname);
 		goto out;