From 2091bc67253d6dc1f68dba2218593701bfc729c0 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Fri, 9 Oct 2009 09:19:39 -0400 Subject: [PATCH] There are a number of different mount options that can be used to set the protocol version on the command line. The config file code needs to know about each option so the command line value will override the config file value. Signed-off-by: Steve Dickson --- utils/mount/configfile.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/utils/mount/configfile.c b/utils/mount/configfile.c index e347b0e..b0aa6f0 100644 --- a/utils/mount/configfile.c +++ b/utils/mount/configfile.c @@ -185,6 +185,20 @@ void free_all(void) free(entry); } } +static char *versions[] = {"v2", "v3", "v4", "vers", "nfsvers", NULL}; +int inline check_vers(char *mopt, char *field) +{ + int i; + + if (strncmp("mountvers", field, strlen("mountvers") != 0 && + (strcasecmp(field, "nfsvers") == 0 || + strcasecmp(field, "vers") == 0))) { + for (i=0; versions[i]; i++) + if (strcasestr(mopt, versions[i]) != NULL) + return 1; + } + return 0; +} /* * Parse the given section of the configuration * file to if there are any mount options set. @@ -207,6 +221,12 @@ 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; buf[0] = '\0'; -- 2.39.2