X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfsumount.c;h=a0fe78ea1cd52456bd6cbdce784fa5846a87ac80;hp=f6294d4e5c83fcd96a09c057a41d163f33e4fc06;hb=d32d65025276630e2f38bf8dc56eef630fcf09e7;hpb=e8c2f652125bf15f7e3c8ee3c05cd2b1b7b6af14

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index f6294d4..a0fe78e 100644
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -17,12 +17,14 @@
  *
  */
 
+#include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
 #include <getopt.h>
 #include <mntent.h>
 #include <sys/mount.h>
 #include <ctype.h>
+#include <pwd.h>
 
 #include "xcommon.h"
 #include "fstab.h"
@@ -32,6 +34,8 @@
 #include "mount_constants.h"
 #include "mount.h"
 #include "nfsumount.h"
+#include "error.h"
+#include "network.h"
 
 #if !defined(MNT_FORCE)
 /* dare not try to include <linux/mount.h> -- lots of errors */
@@ -43,17 +47,12 @@
 #endif
 
 extern char *progname;
-extern int nfs_mount_version;
 extern int nomtab;
 extern int verbose;
 int force;
 int lazy;
 int remount;
 
-extern int find_kernel_nfs_mount_version(void);
-extern int probe_mntport(clnt_addr_t *);
-extern int nfs_gethostbyname(const char *, struct sockaddr_in *);
-
 static inline enum clnt_stat
 nfs_umount(dirpath *argp, CLIENT *clnt)
 {
@@ -91,60 +90,11 @@ int nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp)
 	return res;
 }
 
-struct mntentchn *
-getmntentchn(const char *dir)
-{
-	mntFILE *mfp;
-	nfs_mntent_t *mnt;
-	struct mntentchn *mc = NULL;
-
-	mfp = nfs_setmntent ("/proc/mounts", "r");
-	if (mfp == NULL || mfp->mntent_fp == NULL)
-		return NULL;
-
-	while ((mnt = nfs_getmntent(mfp)) != NULL) {
-		if(strcmp(mnt->mnt_fsname, dir) && strcmp(mnt->mnt_dir, dir))
-			continue;
-
-		if (!mc)
-			mc = (struct mntentchn *)xmalloc(sizeof(*mc));
-		mc->m = *mnt;
-	}
-
-	nfs_endmntent(mfp);
-	return mc;
-}
-
-/* complain about a failed umount */
-static void complain(int err, const char *dev) {
-  switch (err) {
-    case ENXIO:
-      nfs_error (_("umount: %s: invalid block device"), dev); break;
-    case EINVAL:
-      nfs_error (_("umount: %s: not mounted"), dev); break;
-    case EIO:
-      nfs_error (_("umount: %s: can't write superblock"), dev); break;
-    case EBUSY:
-     /* Let us hope fstab has a line "proc /proc ..."
-        and not "none /proc ..."*/
-      nfs_error (_("umount: %s: device is busy"), dev); break;
-    case ENOENT:
-      nfs_error (_("umount: %s: not found"), dev); break;
-    case EPERM:
-      nfs_error (_("umount: %s: must be superuser to umount"), dev); break;
-    case EACCES:
-      nfs_error (_("umount: %s: block devices not permitted on fs"), dev); break;
-    default:
-      nfs_error (_("umount: %s: %s"), dev, strerror (err)); break;
-  }
-}
-
-int del_mtab(const char *spec, const char *node, const char *type,
-		const char *opts, struct mntentchn *mc)
+int del_mtab(const char *spec, const char *node)
 {
-	int umnt_err, umnt_err2, res;
+	int umnt_err, res;
 
-        umnt_err = umnt_err2 = 0;
+        umnt_err = 0;
         if (lazy) {
                 res = umount2 (node, MNT_DETACH);
                 if (res < 0)
@@ -167,35 +117,14 @@ int del_mtab(const char *spec, const char *node, const char *type,
         } else
                 res = umount (node);
 
-        if (res < 0) {
-                umnt_err = errno;
-                /* A device might have been mounted on a node that has since
-                   been deleted or renamed, so if node fails, also try spec. */
-                /* Note that this is incorrect in case spec was mounted
-                   several times. */
-                /* if (umnt_err == ENOENT || umnt_err == EINVAL) */
-                if (umnt_err != EBUSY && strcmp(node, spec)) {
-                        if (verbose)
-                                printf (_("could not umount %s - trying %s instead\n"),
-                                        node, spec);
-                        res = umount (spec);
-                        if (res < 0)
-                                umnt_err2 = errno;
-                       /* Do not complain about remote NFS mount points */
-                        if (errno == ENOENT && index(spec, ':'))
-                                umnt_err2 = 0;
-                }
-        }
-
-        if (res < 0 && remount && (umnt_err == EBUSY || umnt_err2 == EBUSY)) {
+        if (res < 0 && remount && errno == EBUSY && spec) {
                 /* Umount failed - let us try a remount */
                 res = mount(spec, node, NULL,
                             MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL);
                 if (res == 0) {
-                        nfs_mntent_t remnt;
-                        fprintf(stderr,
-                                _("umount: %s busy - remounted read-only\n"),
-                                spec);
+                        struct mntent remnt;
+                        nfs_error(_("%s: %s busy - remounted read-only"),
+                                	progname, spec);
                         remnt.mnt_type = remnt.mnt_fsname = NULL;
                         remnt.mnt_dir = xstrdup(node);
                         remnt.mnt_opts = xstrdup("ro");
@@ -204,38 +133,35 @@ int del_mtab(const char *spec, const char *node, const char *type,
                         return 0;
                 } else if (errno != EBUSY) {    /* hmm ... */
                         perror("remount");
-                        fprintf(stderr,
-                                _("umount: could not remount %s read-only\n"),
-                                spec);
+                        nfs_error(_("%s: could not remount %s read-only"),
+                                	progname, spec);
                 }
         }
 
         if (res >= 0) {
                 /* Umount succeeded */
                 if (verbose)
-                        printf (_("%s umounted\n"), spec);
+                        printf (_("%s umounted\n"), spec ? spec : node);
         }
 
  writemtab:
         if (!nomtab &&
             (umnt_err == 0 || umnt_err == EINVAL || umnt_err == ENOENT)) {
-               update_mtab (node, NULL);
+               update_mtab(node, NULL);
         }
 
         if (res >= 0)
                 return 0;
 
-        if (umnt_err2)
-                complain(umnt_err2, spec);
-        if (umnt_err && umnt_err != umnt_err2)
-                complain(umnt_err, node);
-        return 1;
+        if (umnt_err)
+                umount_error(umnt_err, node);
+        return EX_FILEIO;
 }
 
 /*
  * Returns 1 if everything went well, else 0.
  */
-int _nfsumount(const char *spec, const char *opts)
+int _nfsumount(const char *spec, char *opts)
 {
 	char *hostname;
 	char *dirname;
@@ -244,7 +170,6 @@ int _nfsumount(const char *spec, const char *opts)
 	struct pmap *pmap = &mnt_server.pmap;
 	char *p;
 
-	nfs_mount_version = find_kernel_nfs_mount_version();
 	if (spec == NULL || (p = strchr(spec,':')) == NULL)
 		goto out_bad;
 	hostname = xstrndup(spec, p-spec);
@@ -275,7 +200,6 @@ int _nfsumount(const char *spec, const char *opts)
 
 	pmap->pm_prog = MOUNTPROG;
 	pmap->pm_vers = MOUNTVERS_NFSV3;
-	pmap->pm_prot = IPPROTO_TCP;
 	if (opts && (p = strstr(opts, "mountprog=")) && isdigit(*(p+10)))
 		pmap->pm_prog = atoi(p+10);
 	if (opts && (p = strstr(opts, "mountport=")) && isdigit(*(p+10)))
@@ -297,7 +221,7 @@ int _nfsumount(const char *spec, const char *opts)
 		goto out_bad;
 	return nfs_call_umount(&mnt_server, &dirname);
  out_bad:
-	printf("%s: %s: not found or not mounted\n", progname, spec);
+	nfs_error(_("%s: %s: not found or not mounted"), progname, spec);
 	return 0;
 }
 
@@ -311,7 +235,7 @@ static struct option umount_longopts[] =
   { NULL, 0, 0, 0 }
 };
 
-void umount_usage()
+void umount_usage(void)
 {
 	printf("usage: %s dir [-fvnrlh]\n", progname);
 	printf("options:\n\t-f\t\tforce unmount\n");
@@ -333,6 +257,7 @@ int nfsumount(int argc, char *argv[])
 	argv += 1;
 	argc -= 1;
 
+	argv[0] = argv[-1]; /* So that getopt error messages are correct */
 	while ((c = getopt_long (argc, argv, "fvnrlh",
 				umount_longopts, NULL)) != -1) {
 
@@ -355,35 +280,77 @@ int nfsumount(int argc, char *argv[])
 		case 'h':
 		default:
 			umount_usage();
-			return 0;
+			return EX_USAGE;
 		}
 	}
+	if (optind != argc) {
+		umount_usage();
+		return EX_USAGE;
+	}
 	
 	if (spec == NULL || (*spec != '/' && strchr(spec,':') == NULL)) {
-		printf(_("umount: %s: not found\n"), spec);
-		return 0;
+		nfs_error(_("%s: %s: not found\n"), progname, spec);
+		return EX_USAGE;
 	}
 
-	mc = getmntentchn(spec);
-	if (!mc)
+	if (*spec == '/')
 		mc = getmntdirbackward(spec, NULL);
-	if (!mc)
+	else
 		mc = getmntdevbackward(spec, NULL);
 	if (!mc && verbose)
 		printf(_("Could not find %s in mtab\n"), spec);
 
-	if(mc) {
-		ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
-		if(ret)
-			ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir,
-				mc->m.mnt_type, mc->m.mnt_opts, mc);
+	if (mc && strcmp(mc->m.mnt_type, "nfs") != 0 &&
+	    strcmp(mc->m.mnt_type, "nfs4") != 0) {
+		nfs_error(_("%s: %s on %s it not an nfs filesystem"),
+				progname, mc->m.mnt_fsname, mc->m.mnt_dir);
+		return EX_USAGE;
 	}
-	else {
-		ret = _nfsumount(spec, NULL);
-		if(ret)
-			ret = del_mtab(spec, spec, spec, spec, NULL);
+
+	if (getuid() != 0) {
+		/* only permitted if "user=" or "users" is in mount options */
+		if (!mc) {
+			/* umount might call us twice.  The second time there will
+			 * be no entry in mtab and we should just exit quietly
+			 */
+			return 0;
+
+		only_root:
+			nfs_error(_("%s: You are not permitted to unmount %s"),
+					progname, spec);
+			return EX_USAGE;
+		}
+		if (hasmntopt(&mc->m, "users") == NULL) {
+			char *opt = hasmntopt(&mc->m, "user");
+			struct passwd *pw;
+			char *comma;
+			int len;
+			if (!opt)
+				goto only_root;
+			if (opt[4] != '=')
+				goto only_root;
+			comma = strchr(opt, ',');
+			if (comma)
+				len = comma - (opt + 5);
+			else
+				len = strlen(opt+5);
+			pw = getpwuid(getuid());
+			if (pw == NULL || strlen(pw->pw_name) != len
+			    || strncmp(pw->pw_name, opt+5, len) != 0)
+				goto only_root;
+		}
 	}
 
-	return(ret);
+	ret = 0;
+	if (mc) {
+		if (!lazy)
+			_nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
+		ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
+	} else if (*spec != '/') {
+		if (!lazy)
+			_nfsumount(spec, "tcp,v3");
+	} else
+		ret = del_mtab(NULL, spec);
+
+	return ret;
 }
-