If mount.nfs is not installed setuid, an attempt to perform a "user"

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

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index ea47cb48e4e17e3bebf0d44983efc77c127a92d4..d7271a1c32757b3cadc451e9f093f9aec672dc44 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -18,7 +18,10 @@
  *
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdio.h>
@@ -130,6 +133,16 @@ static const struct opt_map opt_map[] = {
   { "diratime", 0, 1, MS_NODIRATIME },  /* Update dir access times */
   { "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */
 #endif
+#ifdef MS_RELATIME
+  { "relatime", 0, 0, MS_RELATIME },   /* Update access times relative to
+                      mtime/ctime */
+  { "norelatime", 0, 1, MS_RELATIME }, /* Update access time without regard
+                      to mtime/ctime */
+#endif
+  { "noquota", 0, 0, MS_DUMMY },        /* Don't enforce quota */
+  { "quota", 0, 0, MS_DUMMY },          /* Enforce user quota */
+  { "usrquota", 0, 0, MS_DUMMY },       /* Enforce user quota */
+  { "grpquota", 0, 0, MS_DUMMY },       /* Enforce group quota */
   { NULL,      0, 0, 0         }
 };
 
@@ -526,6 +539,12 @@ int main(int argc, char *argv[])
                        mnt_err = EX_USAGE;
                        goto out;
                }
+
+               if (geteuid() != 0) {
+                       nfs_error(_("%s: not installed setuid - "
+                                   "\"user\" NFS mounts not supported."), progname);
+                       exit(EX_FAIL);
+               }
        }
 
        if (chk_mountpoint(mount_point)) {