In order to make decisions about which default version to use when only the
major version is specified, the nfsmount.conf Defaultvers options should
always be parsed, even when a version has already been specified. Remove
the check and bypass for parsing the Defaultvers options from nfsmount.conf.
Signed-off-by: Benjamin Coddington <bcodding@xxxxxxxxxx>
---
utils/mount/configfile.c | 34 ----------------------------------
1 files changed, 0 insertions(+), 34 deletions(-)
diff --git a/utils/mount/configfile.c b/utils/mount/configfile.c
index a0072f1..0a4cc04 100644
--- a/utils/mount/configfile.c
+++ b/utils/mount/configfile.c
@@ -228,35 +228,6 @@ void free_all(void)
free(entry);
}
}
-static char *versions[] = {"v2", "v3", "v4", "vers", "nfsvers", NULL};
-static int
-check_vers(char *mopt, char *field)
-{
- int i, found=0;
-
- /*
- * First check to see if the config setting is one
- * of the many version settings
- */
- for (i=0; versions[i]; i++) {
- if (strcasestr(field, versions[i]) != NULL) {
- found++;
- break;
- }
- }
- if (!found)
- return 0;
- /*
- * It appears the version is being set, now see
- * if the version appears on the command
- */
- for (i=0; versions[i]; i++) {
- if (strcasestr(mopt, versions[i]) != NULL)
- return 1;
- }
-
- return 0;
-}
struct nfs_version config_default_vers;
unsigned long config_default_proto;
@@ -331,11 +302,6 @@ conf_parse_mntopts(char *section, char *arg, char *opts)
snprintf(buf, BUFSIZ, "%s=", node->field);
if (opts && strcasestr(opts, buf) != NULL)
continue;
- /*
- * Protocol verions can be set in a number of ways
- */
- if (opts && check_vers(opts, node->field))
- continue;
if (lookup_entry(node->field) != NULL)
continue;
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
