Introducing the parsing of both 'defaultvers' and 'defaultproto'

config variables which will be used to set the the default
version and network protocol.

A global variable will be set for each option with the
corresponding value. The value will be used as the
initial value in the server negation.

Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/support/include/conffile.h b/support/include/conffile.h
index 672020aa750c5e455276623fb7a484c30e01a0fa..fe23ec27daf319f57c1d66048ea38a333c8053ad 100644 (file)
--- a/support/include/conffile.h
+++ b/support/include/conffile.h
@@ -75,4 +75,11 @@ static inline void upper2lower(char *str)
        while ((c = tolower(*str)))
                *str++ = c;
 }
+
+/*
+ * Default Mount options
+ */
+extern unsigned long config_default_vers;
+extern unsigned long config_default_proto;
+
 #endif                         /* _CONFFILE_H_ */

diff --git a/utils/mount/configfile.c b/utils/mount/configfile.c
index d3285f8bf0cac5f9ebcdc2cbfd7609d163cdf4bf..28b722c7e101034fe9fde2a7039b221c69dd29eb 100644 (file)
--- a/utils/mount/configfile.c
+++ b/utils/mount/configfile.c
@@ -20,13 +20,19 @@
 #include <config.h>
 #endif
 #include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <errno.h>
 
 #include "xlog.h"
+#include "mount.h"
+#include "parse_opt.h"
+#include "network.h"
 #include "conffile.h"
 
 #define KBYTES(x)     ((x) * (1024))
@@ -197,6 +203,51 @@ int inline check_vers(char *mopt, char *field)
        }
        return 0;
 }
+
+unsigned long config_default_vers;
+unsigned long config_default_proto;
+/*
+ * Check to see if a default value is being set.
+ * If so, set the appropriate global value which will 
+ * be used as the initial value in the server negation.
+ */
+int inline default_value(char *mopt)
+{
+       struct mount_options *options = NULL;
+       int dftlen = strlen("default");
+       char *field;
+
+       if (strncasecmp(mopt, "default", dftlen) != 0)
+               return 0;
+
+       field = mopt + dftlen;
+       if (strncasecmp(field, "proto", strlen("proto")) == 0) {
+               if ((options = po_split(field)) != NULL) {
+                       if (!nfs_nfs_protocol(options, &config_default_proto)) {
+                               xlog_warn("Unable to set default protocol : %s", 
+                                       strerror(errno));
+                       }
+               } else {
+                       xlog_warn("Unable to alloc memory for default protocol");
+               }
+       } else if (strncasecmp(field, "vers", strlen("vers")) == 0) {
+               if ((options = po_split(field)) != NULL) {
+                       if (!nfs_nfs_version(options, &config_default_vers)) {
+                               xlog_warn("Unable to set default version: %s", 
+                                       strerror(errno));
+                               
+                       }
+               } else {
+                       xlog_warn("Unable to alloc memory for default version");
+               }
+       } else 
+               xlog_warn("Invalid default setting: '%s'", mopt);
+
+       if (options)
+               po_destroy(options);
+
+       return 1;
+}
 /*
  * Parse the given section of the configuration 
  * file to if there are any mount options set.
@@ -320,15 +371,19 @@ char *conf_get_mntopts(char *spec, char *mount_point,
                free_all();
                return mount_opts;
        }
+
        if (mount_opts) {
                strcpy(config_opts, mount_opts);
                strcat(config_opts, ",");
        }
        SLIST_FOREACH(entry, &head, entries) {
+               if (default_value(entry->opt))
+                       continue;
                strcat(config_opts, entry->opt);
                strcat(config_opts, ",");
        }
-       *(strrchr(config_opts, ',')) = '\0';
+       if ((ptr = strrchr(config_opts, ',')) != NULL)
+               *ptr = '\0';
 
        free_all();
        if (mount_opts)

diff --git a/utils/mount/network.c b/utils/mount/network.c
index bd621befb7e00f1c0a8603657290e132aef9a2b3..1a053519718437f2c5c8b73c7b5a2396c66404e2 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -1261,7 +1261,7 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
  * Returns TRUE if @protocol contains a valid value for this option,
  * or FALSE if the option was specified with an invalid value.
  */
-static int
+int
 nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
 {
        char *option;

diff --git a/utils/mount/network.h b/utils/mount/network.h
index 402e0a50c9977cde5e7b4b7e28296b1451645875..7eb89b049360d7898827294c41a467915e7b3b3e 100644 (file)
--- a/utils/mount/network.h
+++ b/utils/mount/network.h
@@ -57,6 +57,8 @@ int clnt_ping(struct sockaddr_in *, const unsigned long,
 struct mount_options;
 
 int nfs_nfs_version(struct mount_options *options, unsigned long *version);
+int  nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol);
+
 int nfs_options2pmap(struct mount_options *,
                      struct pmap *, struct pmap *);