diff options
| author | Rob Landley | 2006-04-17 23:02:57 +0000 |
|---|---|---|
| committer | Rob Landley | 2006-04-17 23:02:57 +0000 |
| commit | 29ba9796be92ccd1250b6c5c3e7906bebed15838 (patch) | |
| tree | 89ba84bf4cb356219585649b2cc1127534540a82 | |
| parent | 0edbad1a7c8a83dc5584796185d922116951f8f3 (diff) | |
| download | busybox-29ba9796be92ccd1250b6c5c3e7906bebed15838.zip busybox-29ba9796be92ccd1250b6c5c3e7906bebed15838.tar.gz | |
Robert Eggers noticed that nfsmount would sometimes incorrectly return success.
| -rw-r--r-- | util-linux/nfsmount.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c index a98c8f8..be0c87f 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; |