svn commit: trunk/busybox/util-linux

landley at busybox.net landley at busybox.net
Mon Apr 17 23:02:59 UTC 2006


Author: landley
Date: 2006-04-17 16:02:57 -0700 (Mon, 17 Apr 2006)
New Revision: 14904

Log:
Robert Eggers noticed that nfsmount would sometimes incorrectly return success.


Modified:
   trunk/busybox/util-linux/nfsmount.c


Changeset:
Modified: trunk/busybox/util-linux/nfsmount.c
===================================================================
--- trunk/busybox/util-linux/nfsmount.c	2006-04-17 22:49:30 UTC (rev 14903)
+++ trunk/busybox/util-linux/nfsmount.c	2006-04-17 23:02:57 UTC (rev 14904)
@@ -572,14 +572,10 @@
 	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;
+		return 1;
 	}
-	if (mountvers > MAX_NFSPROT) {
-		bb_error_msg("NFSv%d not supported!", nfsvers);
-		return 0;
-	}
 	if (nfsvers && !mountvers)
 		mountvers = (nfsvers < 3) ? 1 : nfsvers;
 	if (nfsvers && nfsvers < mountvers) {




More information about the busybox-cvs mailing list