summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorSteve Dickson <steved@redhat.com>2007-11-03 09:35:05 -0400
committerSteve Dickson <steved@redhat.com>2007-11-03 09:35:05 -0400
commitd4b159620b26dce8f83d41358d618ccc82fa82d4 (patch)
treeaa37ec17a27e63db33e1f83cec941659d8117066 /utils
parentefbda485ff5b3d5916971e1af656d2c21307af30 (diff)
downloadnfs-utils-d4b159620b26dce8f83d41358d618ccc82fa82d4.tar.gz
nfs-utils-d4b159620b26dce8f83d41358d618ccc82fa82d4.tar.xz
nfs-utils-d4b159620b26dce8f83d41358d618ccc82fa82d4.zip
This means that if mountd is run with "--no-nfs-version 3",
It will first probe for NFS version 3, which will succeed (assuming the kernel supported NFSv3), then it will check the matching mountd version (3) and probe_port on discovering that isn't supported will try other versions, find "1" is supported will succeed. This leaves up using mount version 1 for an NFSv3 mount, which doesn't work and leads to a SIGSEGV There is no case where trying other versions is needed the request one is not supported, so simply remove that code. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/mount/network.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/utils/mount/network.c b/utils/mount/network.c
index 63d5f5a..2b09457 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -417,10 +417,6 @@ static int probe_port(clnt_addr_t *server, const unsigned long *versions,
continue;
p_prot = protos;
}
- if (vers == pmap->pm_vers) {
- p_vers = versions;
- vers = 0;
- }
if (vers || !*++p_vers)
break;
}