The current mount.nfs implementation doesn't allow users to specify their
own addr= or clientaddr= option. The new string-based interface does
allow this, even though nfs(5) does not document 'addr=' and specifically
forbids adding 'clientaddr='.
Make the addition of either option by the user a permanent error.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
/*
* Walk through our mount options string, and indicate the presence
/*
* 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)
{
*/
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)
{
*/
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)
* otherwise zero.
*/
static int append_clientaddr_opt(const char *spec, char **extra_opts)
extract_interesting_options(*extra_opts);
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))
extract_interesting_options(*extra_opts);
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))
- if (!ca_opt && !append_clientaddr_opt(spec, extra_opts))
+ if (!append_clientaddr_opt(spec, extra_opts))