diff options
| author | Steve Dickson <steved@redhat.com> | 2021-12-08 11:09:39 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2022-01-04 11:57:30 -0500 |
| commit | ba79e680b50d18125f4d066a45989b17b71289ea (patch) | |
| tree | 7bd4df9a8ba2cd4c13d4e617b43a33ff30b610a8 | |
| parent | 522837f03a4a1b77fc4275504a4c932a11a9bc6f (diff) | |
| download | nfs-utils-ba79e680b50d18125f4d066a45989b17b71289ea.tar.gz | |
mount: Remove NFS v2 support from mount.nfs
This patch removes the ability to do NFS v2
mounts. They will now fail with EOPNOTSUPP.
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | utils/mount/configfile.c | 2 | ||||
| -rw-r--r-- | utils/mount/network.c | 4 | ||||
| -rw-r--r-- | utils/mount/nfsmount.conf | 2 | ||||
| -rw-r--r-- | utils/mount/stropts.c | 10 |
4 files changed, 13 insertions, 5 deletions
diff --git a/utils/mount/configfile.c b/utils/mount/configfile.c index 3d3684e..1d88cbf 100644 --- a/utils/mount/configfile.c +++ b/utils/mount/configfile.c @@ -71,7 +71,7 @@ struct mnt_alias { int mnt_alias_sz = (sizeof(mnt_alias_tab)/sizeof(mnt_alias_tab[0])); static const char *version_keys[] = { - "v2", "v3", "v4", "vers", "nfsvers", "minorversion", NULL + "v3", "v4", "vers", "nfsvers", "minorversion", NULL }; static int strict; diff --git a/utils/mount/network.c b/utils/mount/network.c index 3526117..bfda5c4 100644 --- a/utils/mount/network.c +++ b/utils/mount/network.c @@ -97,7 +97,7 @@ static const char *nfs_transport_opttbl[] = { }; static const char *nfs_version_opttbl[] = { - "v2", + "v2", /* no longer supported */ "v3", "v4", "vers", @@ -1286,7 +1286,7 @@ nfs_nfs_version(char *type, struct mount_options *options, struct nfs_version *v else if (found < 0) return 1; else if (found <= 2 ) { - /* v2, v3, v4 */ + /* v3, v4 */ version_val = version_key + 1; version->v_mode = V_SPECIFIC; } else if (found > 2 ) { diff --git a/utils/mount/nfsmount.conf b/utils/mount/nfsmount.conf index 6bdc225..342063f 100644 --- a/utils/mount/nfsmount.conf +++ b/utils/mount/nfsmount.conf @@ -28,7 +28,7 @@ # This statically named section defines global mount # options that can be applied on all NFS mount. # -# Protocol Version [2,3,4] +# Protocol Version [3,4] # This defines the default protocol version which will # be used to start the negotiation with the server. # Defaultvers=4 diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index fa67a66..3c4e218 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -357,6 +357,7 @@ static int nfs_insert_sloppy_option(struct mount_options *options) static int nfs_set_version(struct nfsmount_info *mi) { + if (!nfs_nfs_version(mi->type, mi->options, &mi->version)) return 0; @@ -1016,7 +1017,6 @@ static int nfs_try_mount(struct nfsmount_info *mi) } switch (mi->version.major) { - case 2: case 3: result = nfs_try_mount_v3v2(mi, FALSE); break; @@ -1247,6 +1247,14 @@ static int nfsmount_start(struct nfsmount_info *mi) if (!nfs_validate_options(mi)) return EX_FAIL; + /* + * NFS v2 has been deprecated + */ + if (mi->version.major == 2) { + mount_error(mi->spec, mi->node, EOPNOTSUPP); + return EX_FAIL; + } + /* * Avoid retry and negotiation logic when remounting */ |