From d4b159620b26dce8f83d41358d618ccc82fa82d4 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Sat, 3 Nov 2007 09:35:05 -0400 Subject: 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 Signed-off-by: Steve Dickson --- utils/mount/network.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'utils') 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; } -- cgit