From: Neil Brown <neilb@suse.de>
Date: Tue, 20 Mar 2007 01:50:04 +0000 (+1100)
Subject: umount.nfs - more strict checks on command line args.
X-Git-Tag: nfs-utils-1-1-0-rc1~27
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=4bc447f758ee4d64706b990ac68cb766dbff113c;hp=44a3727a3243e674a1f1fdad5cbbc639aa25d01c

umount.nfs - more strict checks on command line args.

Reject if there are non-flag args,
Reject if the filesystem is not an NFS filesystem.
---

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index 1decf07..e101105 100644
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -313,6 +313,10 @@ int nfsumount(int argc, char *argv[])
 			return 0;
 		}
 	}
+	if (optind != argc) {
+		umount_usage();
+		return 0;
+	}
 	
 	if (spec == NULL || (*spec != '/' && strchr(spec,':') == NULL)) {
 		printf(_("umount: %s: not found\n"), spec);
@@ -326,6 +330,13 @@ int nfsumount(int argc, char *argv[])
 	if (!mc && verbose)
 		printf(_("Could not find %s in mtab\n"), spec);
 
+	if (mc && strcmp(mc->m.mnt_type, "nfs") != 0 &&
+	    strcmp(mc->m.mnt_type, "nfs4") != 0) {
+		fprintf(stderr, "umount.nfs: %s on %s it not an nfs filesystem\n",
+			mc->m.mnt_fsname, mc->m.mnt_dir);
+		exit(1);
+	}
+
 	if (getuid() != 0) {
 		/* only permitted if "user=" or "users" is in mount options */
 		if (!mc) {