You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
89 lines
2.7 KiB
89 lines
2.7 KiB
diff -up nfs-utils-1.3.0/nfs.conf.orig nfs-utils-1.3.0/nfs.conf |
|
--- nfs-utils-1.3.0/nfs.conf.orig 2017-06-19 11:15:31.661716122 -0400 |
|
+++ nfs-utils-1.3.0/nfs.conf 2017-06-19 11:15:51.945058695 -0400 |
|
@@ -66,6 +66,3 @@ |
|
# outgoing-port= |
|
# outgoing-addr= |
|
# lift-grace=y |
|
-# |
|
-#[svcgssd] |
|
-# principal= |
|
diff -up nfs-utils-1.3.0/utils/mount/stropts.c.orig nfs-utils-1.3.0/utils/mount/stropts.c |
|
--- nfs-utils-1.3.0/utils/mount/stropts.c.orig 2017-06-19 11:15:31.667716223 -0400 |
|
+++ nfs-utils-1.3.0/utils/mount/stropts.c 2017-06-19 11:25:53.000204600 -0400 |
|
@@ -73,6 +73,13 @@ |
|
#define NFS_DEF_BG_TIMEOUT_MINUTES (10000u) |
|
#endif |
|
|
|
+#ifndef NFS_DEFAULT_MAJOR |
|
+#define NFS_DEFAULT_MAJOR 4 |
|
+#endif |
|
+#ifndef NFS_DEFAULT_MINOR |
|
+#define NFS_DEFAULT_MINOR 1 |
|
+#endif |
|
+ |
|
extern int nfs_mount_data_version; |
|
extern char *progname; |
|
extern int verbose; |
|
@@ -111,20 +118,28 @@ static void nfs_default_version(struct n |
|
if (mi->version.v_mode == V_DEFAULT && |
|
config_default_vers.v_mode != V_DEFAULT) { |
|
mi->version.major = config_default_vers.major; |
|
- mi->version.minor = config_default_vers.minor; |
|
+ if (config_default_vers.v_mode == V_SPECIFIC) |
|
+ mi->version.minor = config_default_vers.minor; |
|
+ else |
|
+ mi->version.minor = NFS_DEFAULT_MINOR; |
|
return; |
|
} |
|
|
|
if (mi->version.v_mode == V_GENERAL) { |
|
if (config_default_vers.v_mode != V_DEFAULT && |
|
- mi->version.major == config_default_vers.major) |
|
- mi->version.minor = config_default_vers.minor; |
|
+ mi->version.major == config_default_vers.major) { |
|
+ if (config_default_vers.v_mode == V_SPECIFIC) |
|
+ mi->version.minor = config_default_vers.minor; |
|
+ else |
|
+ mi->version.minor = NFS_DEFAULT_MINOR; |
|
+ } else |
|
+ mi->version.minor = NFS_DEFAULT_MINOR; |
|
return; |
|
} |
|
|
|
#endif /* MOUNT_CONFIG */ |
|
- mi->version.major = 4; |
|
- mi->version.minor = 1; |
|
+ mi->version.major = NFS_DEFAULT_MAJOR; |
|
+ mi->version.minor = NFS_DEFAULT_MINOR; |
|
} |
|
|
|
/* |
|
@@ -314,7 +329,9 @@ static int nfs_set_version(struct nfsmou |
|
return 0; |
|
|
|
if (strncmp(mi->type, "nfs4", 4) == 0) { |
|
- mi->version.major = 4; |
|
+ /* Set to default values */ |
|
+ mi->version.major = NFS_DEFAULT_MAJOR; |
|
+ mi->version.minor = NFS_DEFAULT_MINOR; |
|
mi->version.v_mode = V_GENERAL; |
|
} |
|
/* |
|
@@ -750,13 +767,9 @@ static int nfs_do_mount_v4(struct nfsmou |
|
} |
|
|
|
if (mi->version.v_mode != V_SPECIFIC) { |
|
- if (mi->version.v_mode == V_GENERAL) |
|
- snprintf(version_opt, sizeof(version_opt) - 1, |
|
- "vers=%lu", mi->version.major); |
|
- else |
|
- snprintf(version_opt, sizeof(version_opt) - 1, |
|
- "vers=%lu.%lu", mi->version.major, |
|
- mi->version.minor); |
|
+ snprintf(version_opt, sizeof(version_opt) - 1, |
|
+ "vers=%lu.%lu", mi->version.major, |
|
+ mi->version.minor); |
|
|
|
if (po_append(options, version_opt) == PO_FAILED) { |
|
errno = EINVAL;
|
|
|