Robert Eggers noticed that nfsmount would sometimes incorrectly return success.

diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
index a98c8f8ae98c536bac9e4c0e1b5f3dabdfcbd14c..be0c87f717cec34d622124abfd39cf95b80038bb 100644 (file)
--- 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;