X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fmount.c;h=52b0d67d208281b5bbc75b3a1d55ef2a6854698e;hp=4da900240e249eda79c54de0291ea42c11c5d1ab;hb=e8a29cc56f3bf9b550b0f4f4876f23ca379d3e14;hpb=390e67de5d9fe919d1894359536f0c5527fa2331 diff --git a/utils/mount/mount.c b/utils/mount/mount.c index 4da9002..52b0d67 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -99,11 +99,9 @@ static const struct opt_map opt_map[] = { { "rbind", 0, 0, MS_BIND|MS_REC }, /* Idem, plus mounted subtrees */ { "auto", 0, 0, MS_DUMMY }, /* Can be mounted using -a */ { "noauto", 0, 0, MS_DUMMY }, /* Can only be mounted explicitly */ - { "users", 1, 0, MS_USERS|MS_NOEXEC|MS_NOSUID|MS_NODEV }, - /* Allow ordinary user to mount */ + { "users", 1, 0, MS_USERS }, /* Allow ordinary user to mount */ { "nousers", 0, 1, MS_DUMMY }, /* Forbid ordinary user to mount */ - { "user", 1, 0, MS_USER|MS_NOEXEC|MS_NOSUID|MS_NODEV }, - /* Allow ordinary user to mount */ + { "user", 1, 0, MS_USER }, /* Allow ordinary user to mount */ { "nouser", 0, 1, MS_DUMMY }, /* Forbid ordinary user to mount */ { "owner", 0, 0, MS_DUMMY }, /* Let the owner of the device mount */ { "noowner", 0, 0, MS_DUMMY }, /* Device owner has no special privs */ @@ -261,18 +259,30 @@ static void parse_opts (const char *options, int *flags, char **extra_opts) { if (options != NULL) { char *opts = xstrdup(options); - char *opt; - int len = strlen(opts) + 20; + char *opt, *p; + int len = strlen(opts) + 1; /* include room for a null */ + int open_quote = 0; *extra_opts = xmalloc(len); **extra_opts = '\0'; - for (opt = strtok(opts, ","); opt; opt = strtok(NULL, ",")) - parse_opt(opt, flags, *extra_opts, len); - + for (p=opts, opt=NULL; p && *p; p++) { + if (!opt) + opt = p; /* begin of the option item */ + if (*p == '"') + open_quote ^= 1; /* reverse the status */ + if (open_quote) + continue; /* still in a quoted block */ + if (*p == ',') + *p = '\0'; /* terminate the option item */ + /* end of option item or last item */ + if (*p == '\0' || *(p+1) == '\0') { + parse_opt(opt, flags, *extra_opts, len); + opt = NULL; + } + } free(opts); } - } static void mount_error(char *node) @@ -292,7 +302,33 @@ static void mount_error(char *node) } } -static void start_statd() +extern u_short getport( + struct sockaddr_in *saddr, + u_long prog, + u_long vers, + u_int prot); + +static int probe_statd() +{ + struct sockaddr_in addr; + u_short port; + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + port = getport(&addr, 100024, 1, IPPROTO_UDP); + + if (port == 0) + return 0; + addr.sin_port = htons(port); + + if (clnt_ping(&addr, 100024, 1, IPPROTO_UDP, NULL) <= 0) + return 0; + + return 1; +} + +static int start_statd() { /* If /var/run/rpc.statd.pid exists and is non-empty, * assume statd already running. @@ -301,15 +337,19 @@ static void start_statd() * else run that file (typically a shell script) */ struct stat stb; - if (stat("/var/run/rpc.statd.pid", &stb) == 0 && - stb.st_size > 0) - return; + + if (probe_statd()) + return 1; #ifdef START_STATD if (stat(START_STATD, &stb) ==0 && S_ISREG(stb.st_mode) && - (stb.st_mode & S_IXUSR)) + (stb.st_mode & S_IXUSR)) { system(START_STATD); + if (probe_statd()) + return 1; + } #endif + return 0; } int main(int argc, char *argv[]) @@ -320,6 +360,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; @@ -331,12 +374,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 @@ -344,6 +382,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) { @@ -351,7 +398,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; @@ -404,27 +459,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.nfs4") == 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); @@ -435,17 +508,24 @@ 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, 0, &need_statd); - if (!mnt_err && !fake && need_statd) - start_statd(); + if (!mnt_err && !fake && need_statd) { + if (!start_statd()) { + fprintf(stderr, + "%s: rpc.statd is not running but is " + "required for remote locking\n" + " Either use \"-o nolocks\" to keep " + "locks local, or start statd.\n", + progname); + exit(1); + } + } } if (mnt_err) @@ -454,7 +534,8 @@ int main(int argc, char *argv[]) if (!fake) { mnt_err = do_mount_syscall(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs", - flags, mount_opts); + flags & ~(MS_USER|MS_USERS) , + mount_opts); if (mnt_err) { mount_error(mount_point);