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

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 4dbd19e..537a924 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -305,6 +305,7 @@ static int append_clientaddr_option(struct sockaddr_in *saddr,
 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, retval = EX_FAIL;
@@ -316,15 +317,19 @@ int nfsmount_s(const char *spec, const char *node, int flags,
 	if (!err)
 		goto out;
 
-	extract_interesting_options(*extra_opts);
-
-	if (!child && addr_opt) {
-		nfs_error(_("%s: Illegal option: 'addr='"), progname);
+	options = po_split(*extra_opts);
+	if (!options) {
+		nfs_error(_("%s: internal option parsing error"), progname);
 		goto out;
 	}
 
-	if (!append_addr_opt(&saddr, extra_opts))
+	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"),
@@ -341,6 +346,7 @@ int nfsmount_s(const char *spec, const char *node, int flags,
 	retval = EX_SUCCESS;
 
 out:
+	po_destroy(options);
 	return retval;
 }
 
@@ -361,6 +367,7 @@ out:
 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, retval = EX_FAIL;
@@ -372,18 +379,22 @@ int nfs4mount_s(const char *spec, const char *node, int flags,
 	if (!err)
 		goto out;
 
-	extract_interesting_options(*extra_opts);
-
-	if (addr_opt) {
-		nfs_error(_("%s: Illegal option: 'addr='"), progname);
+	options = po_split(*extra_opts);
+	if (!options) {
+		nfs_error(_("%s: internal option parsing error"), progname);
 		goto out;
 	}
 
-	if (!append_addr_opt(&saddr, extra_opts))
+	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))
+	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"),
@@ -400,5 +411,6 @@ int nfs4mount_s(const char *spec, const char *node, int flags,
 	retval = EX_SUCCESS;
 
 out:
+	po_destroy(options);
 	return retval;
 }