X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=cadb1f473e4b4383eedbd58060648f9cf7b560d3;hb=f1a21c54149d24f8f8f875c2883af449d921c50b;hp=2d717fb296cde6ed9d9426339c6628e350b2c1ab;hpb=ec565223d509f1537c38ae01d330fb24e4305da9;p=nfs-utils.git

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 2d717fb..cadb1f4 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <ctype.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -304,9 +308,6 @@ static struct mount_options *rewrite_mount_options(char *str)
 	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);
@@ -317,9 +318,6 @@ static struct mount_options *rewrite_mount_options(char *str)
 		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) {
@@ -681,32 +679,32 @@ int nfsmount_string(const char *spec, const char *node, const char *type,
 	struct mount_options *options = NULL;
 	struct sockaddr_in saddr;
 	char *hostname;
-	int err, retval = EX_FAIL;
+	int retval = EX_FAIL;
 
 	if (!parse_devname(spec, &hostname))
-		goto out;
-	err = fill_ipv4_sockaddr(hostname, &saddr);
-	free(hostname);
-	if (!err)
-		goto out;
+		return retval;
+	if (!fill_ipv4_sockaddr(hostname, &saddr))
+		goto fail;
 
 	options = po_split(*extra_opts);
 	if (!options) {
 		nfs_error(_("%s: internal option parsing error"), progname);
-		goto out;
+		goto fail;
 	}
 
 	if (!set_mandatory_options(type, &saddr, options))
 		goto out;
 
-	if (try_mount(spec, node, type, flags, options, fake, extra_opts)) {
-		mount_error(spec, node, errno);
-		goto out;
-	}
-
-	retval = EX_SUCCESS;
+	if (po_rightmost(options, "bg", "fg") == PO_KEY1_RIGHTMOST)
+		retval = nfsmount_bg(spec, node, type, hostname, flags,
+					options, fake, child, extra_opts);
+	else
+		retval = nfsmount_fg(spec, node, type, flags, options,
+							fake, extra_opts);
 
 out:
 	po_destroy(options);
+fail:
+	free(hostname);
 	return retval;
 }