Build mount.nfs by default, and install setuid

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

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index cdccfe894778a957245242c1657c87629c4659b9..c6644b1cde10b24a2be3c31ac138c21bc29c996f 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -179,6 +179,11 @@ int add_mtab(char *fsname, char *mount_point, char *fstype, int flags, char *opt
        ment.mnt_freq = 0;
        ment.mnt_passno= 0;
 
+       if(flags & MS_REMOUNT) {
+               update_mtab(ment.mnt_dir, &ment);
+               return 0;
+       }
+
        lock_mtab();
 
         if ((mtab = setmntent(MOUNTED, "a+")) == NULL) {
@@ -274,16 +279,16 @@ static void mount_error(char *node)
 {
        switch(errno) {
                case ENOTDIR:
-                       printf("%s: mount point %s is not a directory\n", progname, node);
+                       fprintf(stderr, "%s: mount point %s is not a directory\n", progname, node);
                        break;
                case EBUSY:
-                       printf("%s: %s is already mounted or busy\n", progname, node);
+                       fprintf(stderr, "%s: %s is already mounted or busy\n", progname, node);
                        break;
                case ENOENT:
-                       printf("%s: mount point %s does not exist\n", progname, node);
+                       fprintf(stderr, "%s: mount point %s does not exist\n", progname, node);
                        break;
                default:
-                       printf("%s: %s\n", progname, strerror(errno));
+                       fprintf(stderr, "%s: %s\n", progname, strerror(errno));
        }
 }
 
@@ -315,6 +320,9 @@ int main(int argc, char *argv[])
        uid_t uid = getuid();
 
        progname = argv[0];
+       if (!progname)
+               exit(2);
+
        if ((p = strrchr(progname, '/')) != NULL)
                progname = p+1;
 
@@ -326,12 +334,7 @@ int main(int argc, char *argv[])
                exit(nfsumount(argc, argv) ? 0 : 1);
        }
 
-       if ((argc < 2)) {
-               mount_usage();
-               exit(1);
-       }
-
-       if(argv[1][0] == '-') {
+       if(argv[1] && argv[1][0] == '-') {
                if(argv[1][1] == 'V')
                        printf("%s ("PACKAGE_STRING")\n", progname);
                else
@@ -339,6 +342,15 @@ int main(int argc, char *argv[])
                return 0;
        }
 
+       if ((argc < 3)) {
+               mount_usage();
+               exit(1);
+       }
+
+       spec = argv[1];
+       mount_point = argv[2];
+
+       argv[2] = argv[0]; /* so that getopt error messages are correct */
        while ((c = getopt_long (argc - 2, argv + 2, "rt:vVwfno:hs",
                                longopts, NULL)) != -1) {
                switch (c) {
@@ -346,7 +358,15 @@ int main(int argc, char *argv[])
                        flags |= MS_RDONLY;
                        break;
                case 't':
-                       nfs_mount_vers = (strncmp(optarg, "nfs4", 4)) ? 0 : 4;
+                       if (strcmp(optarg, "nfs4") == 0)
+                               nfs_mount_vers = 4;
+                       else if (strcmp(optarg, "nfs") == 0)
+                               nfs_mount_vers = 0;
+                       else {
+                               fprintf(stderr, "%s: unknown filesystem type: %s\n",
+                                       progname, optarg);
+                               exit(1);
+                       }
                        break;
                case 'v':
                        ++verbose;
@@ -399,27 +419,45 @@ int main(int argc, char *argv[])
                        exit(1);
                }
        }
+       if (optind != argc-2) {
+               /* Extra non-option words at the end... */
+               mount_usage();
+               exit(1);
+       }
 
-       spec = argv[1];
-       mount_point = argv[2];
+       if (strcmp(progname, "mount.nfsv4") == 0)
+               nfs_mount_vers = 4;
 
        if (uid != 0) {
                /* don't even think about it unless options exactly
-                * make fstab
+                * match fstab
                 */
                struct mntentchn *mc;
 
                if ((mc = getfsfile(mount_point)) == NULL ||
                    strcmp(mc->m.mnt_fsname, spec) != 0 ||
-                   strcmp(mc->m.mnt_opts, mount_opts) != 0) {
+                   strcmp(mc->m.mnt_type, (nfs_mount_vers == 4 ? "nfs4":"nfs")) != 0
+                   ) {
                        fprintf(stderr, "%s: permission died - no match for fstab\n",
                                progname);
                        exit(1);
                }
+               /* 'mount' munges the options from fstab before passing them
+                * to us, so it is non-trivial to test that we have the correct
+                * set of options and we don't want to trust what the user
+                * gave us, so just take whatever is in fstab
+                */
+               mount_opts = strdup(mc->m.mnt_opts);
                mounttype = 0;
        }
 
        mount_point = canonicalize(mount_point);
+       if (mount_point == NULL ||
+           mount_point[0] != '/') {
+               fprintf(stderr, "%s: unknown mount point %s\n",
+                       progname, mount_point ? : "");
+               exit(1);
+       }
        
        parse_opts(mount_opts, &flags, &extra_opts);
 
@@ -430,11 +468,9 @@ int main(int argc, char *argv[])
            }
        }
 
-       if (!strcmp(progname, "mount.nfs4") || nfs_mount_vers == 4) {
-               nfs_mount_vers = 4;
+       if (nfs_mount_vers == 4)
                mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0);
-       }
-       else if (!strcmp(progname, "mount.nfs")) {
+       else {
                int need_statd = 0;
                mnt_err = nfsmount(spec, mount_point, &flags,
                                   &extra_opts, &mount_opts,
@@ -443,18 +479,19 @@ int main(int argc, char *argv[])
                        start_statd();
        }
 
-       if (fake)
-               return 0;
        if (mnt_err)
                exit(EX_FAIL);
 
-       mnt_err = do_mount_syscall(spec, mount_point,
-                                  nfs_mount_vers == 4 ? "nfs4" : "nfs",
-                                  flags, mount_opts);
-               
-       if (mnt_err) {
-               mount_error(mount_point);
-               exit(EX_FAIL);
+       if (!fake) {
+               mnt_err = do_mount_syscall(spec, mount_point,
+                                          nfs_mount_vers == 4 ? "nfs4" : "nfs",
+                                          flags & ~(MS_USER|MS_USERS) ,
+                                          mount_opts);
+
+               if (mnt_err) {
+                       mount_error(mount_point);
+                       exit(EX_FAIL);
+               }
        }
 
        if (!nomtab)