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 cc00bf7b95cc304a287f450d37e8674aa93ee98d..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>
@@ -36,6 +39,7 @@
 #include "nls.h"
 #include "mount_constants.h"
 #include "nfs_paths.h"
+#include "nfs_mntent.h"
 
 #include "nfs_mount.h"
 #include "nfs4_mount.h"
@@ -129,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         }
 };
 
@@ -227,7 +241,7 @@ static int add_mtab(char *spec, char *mount_point, char *fstype,
                        int flags, char *opts, int freq, int pass)
 {
        struct mntent ment;
-       FILE *mtab;
+       mntFILE *mtab;
        int result = EX_FILEIO;
 
        ment.mnt_fsname = spec;
@@ -245,19 +259,20 @@ static int add_mtab(char *spec, char *mount_point, char *fstype,
 
        lock_mtab();
 
-       if ((mtab = setmntent(MOUNTED, "a+")) == NULL) {
+       mtab = nfs_setmntent(MOUNTED, "a+");
+       if (mtab == NULL || mtab->mntent_fp == NULL) {
                nfs_error(_("Can't open mtab: %s"),
                                strerror(errno));
                goto fail_unlock;
        }
 
-       if (addmntent(mtab, &ment) == 1) {
+       if (nfs_addmntent(mtab, &ment) == 1) {
                nfs_error(_("Can't write mount entry to mtab: %s"),
                                strerror(errno));
                goto fail_close;
        }
 
-       if (fchmod(fileno(mtab), 0644) == -1) {
+       if (fchmod(fileno(mtab->mntent_fp), 0644) == -1) {
                nfs_error(_("Can't set permissions on mtab: %s"),
                                strerror(errno));
                goto fail_close;
@@ -266,7 +281,7 @@ static int add_mtab(char *spec, char *mount_point, char *fstype,
        result = EX_SUCCESS;
 
 fail_close:
-       endmntent(mtab);
+       nfs_endmntent(mtab);
 fail_unlock:
        unlock_mtab();
        free(ment.mnt_opts);
@@ -524,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)) {