mount.nfs: Don't allow the user to specify addr= or clientaddr=.

[nfs-utils.git] / utils / mount / stropts.c

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index c11420069d97e363d456eb2c998c8e0054cfd03d..e43bbf48d356772c2bfa255edbebb4388138a3fd 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -37,6 +37,7 @@
 #include "nls.h"
 #include "nfs_mount.h"
 #include "mount_constants.h"
+#include "stropts.h"
 #include "error.h"
 #include "network.h"
 
@@ -129,7 +130,7 @@ static int get_my_ipv4addr(char *ip_addr, int len)
 
 /*
  * Walk through our mount options string, and indicate the presence
- * of 'bg', 'retry=', and 'clientaddr='.
+ * of 'bg', 'retry=', 'addr=', and 'clientaddr='.
  */
 static void extract_interesting_options(char *opts)
 {
@@ -160,9 +161,10 @@ static void extract_interesting_options(char *opts)
 }
 
 /*
- * Append the "addr=" option to the options string.
+ * Append the 'addr=' option to the options string.
  *
- * We always add our own addr= to the end of the options string.
+ * Returns 1 if 'addr=' option created successfully;
+ * otherwise zero.
  */
 static int append_addr_opt(const char *spec, char **extra_opts)
 {
@@ -205,9 +207,9 @@ static int append_addr_opt(const char *spec, char **extra_opts)
 }
 
 /*
- * Append the "clientaddr=" option to the options string.
+ * Append the 'clientaddr=' option to the options string.
  *
- * Returns 1 if clientaddr option created successfully;
+ * Returns 1 if 'clientaddr=' option created successfully;
  * otherwise zero.
  */
 static int append_clientaddr_opt(const char *spec, char **extra_opts)
@@ -254,17 +256,18 @@ int nfsmount_s(const char *spec, const char *node, int flags,
 {
        int retval = EX_FAIL;
 
-       if (verbose)
-               printf(_("%s: using C string mount system call interface\n"),
-                       progname);
-
        extract_interesting_options(*extra_opts);
 
-       if (!addr_opt && !append_addr_opt(spec, extra_opts))
+       if (!bg && addr_opt) {
+               nfs_error(_("%s: Illegal option: 'addr='"), progname);
+               goto fail;
+       }
+
+       if (!append_addr_opt(spec, extra_opts))
                goto fail;
 
        if (verbose)
-               printf(_("%s: option string is '%s'\n"),
+               printf(_("%s: text-based options: '%s'\n"),
                        progname, *extra_opts);
 
        if (!fake) {
@@ -290,30 +293,36 @@ fail:
  * @extra_opts:        pointer to C string containing fs-specific mount options
  *             (possibly also a return argument)
  * @fake:      flag indicating whether to carry out the whole operation
- * @bg:                one if this is a backgrounded mount attempt
+ * @child:     one if this is a backgrounded mount
  *
  * XXX: need to handle bg, fg, and retry options.
  *
  */
 int nfs4mount_s(const char *spec, const char *node, int flags,
-               char **extra_opts, int fake)
+               char **extra_opts, int fake, int child)
 {
        int retval = EX_FAIL;
 
-       if (verbose)
-               printf(_("%s: using C string mount system call interface\n"),
-                       progname);
-
        extract_interesting_options(*extra_opts);
 
-       if (!addr_opt && !append_addr_opt(spec, extra_opts))
+       if (addr_opt) {
+               nfs_error(_("%s: Illegal option: 'addr='"), progname);
+               goto fail;
+       }
+
+       if (ca_opt) {
+               nfs_error(_("%s: Illegal option: 'clientaddr='"), progname);
+               goto fail;
+       }
+
+       if (!append_addr_opt(spec, extra_opts))
                goto fail;
 
-       if (!ca_opt && !append_clientaddr_opt(spec, extra_opts))
+       if (!append_clientaddr_opt(spec, extra_opts))
                goto fail;
 
        if (verbose)
-               printf(_("%s: option string is '%s'\n"),
+               printf(_("%s: text-based options: '%s'\n"),
                        progname, *extra_opts);
 
        if (!fake) {