Made some aesthetic changes to the code that sets

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

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 069bdc1ca6aa90d6120434890099e0583a7c6ab4..3a2a237931835eeea19ca311138079442221235b 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -45,6 +45,7 @@
 #include "parse_opt.h"
 #include "version.h"
 #include "parse_dev.h"
+#include "conffile.h"
 
 #ifndef NFS_PROGRAM
 #define NFS_PROGRAM    (100003)
@@ -92,6 +93,25 @@ struct nfsmount_info {
                                child;          /* forked bg child? */
 };
 
+#ifdef MOUNT_CONFIG
+static void nfs_default_version(struct nfsmount_info *mi);
+
+static void nfs_default_version(struct nfsmount_info *mi)
+{
+       extern unsigned long config_default_vers;
+       /*
+        * Use the default value set in the config file when
+        * the version has not been explicitly set.
+        */
+       if (mi->version == 0 && config_default_vers) {
+               if (config_default_vers < 4)
+                       mi->version = config_default_vers;
+       }
+}
+#else
+inline void nfs_default_version(struct nfsmount_info *mi) {}
+#endif /* MOUNT_CONFIG */
+
 /*
  * Obtain a retry timeout value based on the value of the "retry=" option.
  *
@@ -284,6 +304,12 @@ static int nfs_validate_options(struct nfsmount_info *mi)
                        mi->version = 3;
        }
 
+       /*
+        * If enabled, see if the default version was
+        * set in the config file
+        */
+       nfs_default_version(mi);
+
        if (!nfs_append_sloppy_option(mi->options))
                return 0;
 
@@ -604,8 +630,15 @@ static int nfs_try_mount(struct nfsmount_info *mi)
                if (linux_version_code() > MAKE_VERSION(2, 6, 31)) {
                        errno = 0;
                        result = nfs_try_mount_v4(mi);
-                       if (errno != EPROTONOSUPPORT)
-                               break;
+                       if (errno != EPROTONOSUPPORT) {
+                               /* 
+                                * To deal with legacy Linux servers that don't
+                                * automatically export a pseudo root, retry
+                                * ENOENT errors using version 3
+                                */
+                               if (errno != ENOENT)
+                                       break;
+                       }
                }
        case 2:
        case 3: