aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-04-17 23:02:57 +0000
committerGravatar Rob Landley <rob@landley.net>2006-04-17 23:02:57 +0000
commit29ba9796be92ccd1250b6c5c3e7906bebed15838 (patch)
tree89ba84bf4cb356219585649b2cc1127534540a82 /util-linux
parent0edbad1a7c8a83dc5584796185d922116951f8f3 (diff)
downloadbusybox-29ba9796be92ccd1250b6c5c3e7906bebed15838.tar.gz
busybox-29ba9796be92ccd1250b6c5c3e7906bebed15838.tar.bz2
Robert Eggers noticed that nfsmount would sometimes incorrectly return success.
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/nfsmount.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
index a98c8f8ae..be0c87f71 100644
--- a/util-linux/nfsmount.c
+++ b/util-linux/nfsmount.c
@@ -572,13 +572,9 @@ int nfsmount(const char *spec, const char *node, int *flags,
if (nfs_mount_version >= 3)
data.flags |= (nolock ? NFS_MOUNT_NONLM : 0);
#endif
- if (nfsvers > MAX_NFSPROT) {
+ if (nfsvers > MAX_NFSPROT || mountvers > MAX_NFSPROT) {
bb_error_msg("NFSv%d not supported!", nfsvers);
- return 0;
- }
- if (mountvers > MAX_NFSPROT) {
- bb_error_msg("NFSv%d not supported!", nfsvers);
- return 0;
+ return 1;
}
if (nfsvers && !mountvers)
mountvers = (nfsvers < 3) ? 1 : nfsvers;