Build mount.nfs by default, and install setuid

[nfs-utils.git] / utils / mount / nfsumount.c

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index 4208ade291d1c63898f5b374df568f10c4ac9243..e65f58f0122374ad92f881d96e7072a9f0fbe03e 100644 (file)
--- 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"
@@ -147,7 +149,7 @@ int del_mtab(const char *spec, const char *node)
                 res = mount(spec, node, NULL,
                             MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL);
                 if (res == 0) {
-                        nfs_mntent_t remnt;
+                        struct mntent remnt;
                         fprintf(stderr,
                                 _("umount: %s busy - remounted read-only\n"),
                                 spec);
@@ -188,7 +190,7 @@ int del_mtab(const char *spec, const char *node)
 /*
  * 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;
@@ -250,7 +252,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);
+       fprintf(stderr, "%s: %s: not found or not mounted\n", progname, spec);
        return 0;
 }
 
@@ -286,6 +288,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) {
 
@@ -311,6 +314,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);
@@ -324,6 +331,47 @@ 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) {
+                       /* 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:
+                       fprintf(stderr,"%s: You are not permitted to unmount %s\n",
+                               progname, spec);
+                       return 0;
+               }
+               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;
+               }
+       }
+
        ret = 0;
        if (mc) {
                if (!lazy)