X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfsumount.c;h=fd4194faf6d196e1e572e53beeadf29a50dec718;hp=4208ade291d1c63898f5b374df568f10c4ac9243;hb=f5bab6c03c5205ef9d062f167cc30060f90fedc4;hpb=d80e49e559da01cd0b4cb23eb9e2351aca7e2ec5 diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c index 4208ade..fd4194f 100644 --- a/utils/mount/nfsumount.c +++ b/utils/mount/nfsumount.c @@ -17,12 +17,14 @@ * */ +#include #include #include #include #include #include #include +#include #include "xcommon.h" #include "fstab.h" @@ -32,6 +34,8 @@ #include "mount_constants.h" #include "mount.h" #include "nfsumount.h" +#include "error.h" +#include "network.h" #if !defined(MNT_FORCE) /* dare not try to include -- lots of errors */ @@ -43,79 +47,13 @@ #endif extern char *progname; -extern int nfs_mount_version; extern int nomtab; extern int verbose; int force; int lazy; int remount; -extern int find_kernel_nfs_mount_version(void); -extern int probe_mntport(clnt_addr_t *); -extern int nfs_gethostbyname(const char *, struct sockaddr_in *); - -static inline enum clnt_stat -nfs_umount(dirpath *argp, CLIENT *clnt) -{ - return clnt_call(clnt, MOUNTPROC_UMNT, - (xdrproc_t) xdr_dirpath, (caddr_t)argp, - (xdrproc_t) xdr_void, NULL, - TIMEOUT); -} - -int nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp) -{ - CLIENT *clnt; - enum clnt_stat res = 0; - int msock; - - switch (mnt_server->pmap.pm_vers) { - case 3: - case 2: - case 1: - if (!probe_mntport(mnt_server)) - goto out_bad; - clnt = mnt_openclnt(mnt_server, &msock); - if (!clnt) - goto out_bad; - res = nfs_umount(argp, clnt); - mnt_closeclnt(clnt, msock); - if (res == RPC_SUCCESS) - return 1; - break; - default: - res = 1; - break; - } - out_bad: - return res; -} - -/* complain about a failed umount */ -static void complain(int err, const char *dev) { - switch (err) { - case ENXIO: - nfs_error (_("umount: %s: invalid block device"), dev); break; - case EINVAL: - nfs_error (_("umount: %s: not mounted"), dev); break; - case EIO: - nfs_error (_("umount: %s: can't write superblock"), dev); break; - case EBUSY: - /* Let us hope fstab has a line "proc /proc ..." - and not "none /proc ..."*/ - nfs_error (_("umount: %s: device is busy"), dev); break; - case ENOENT: - nfs_error (_("umount: %s: not found"), dev); break; - case EPERM: - nfs_error (_("umount: %s: must be superuser to umount"), dev); break; - case EACCES: - nfs_error (_("umount: %s: block devices not permitted on fs"), dev); break; - default: - nfs_error (_("umount: %s: %s"), dev, strerror (err)); break; - } -} - -int del_mtab(const char *spec, const char *node) +static int del_mtab(const char *spec, const char *node) { int umnt_err, res; @@ -147,10 +85,9 @@ 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; - fprintf(stderr, - _("umount: %s busy - remounted read-only\n"), - spec); + struct mntent remnt; + nfs_error(_("%s: %s busy - remounted read-only"), + progname, spec); remnt.mnt_type = remnt.mnt_fsname = NULL; remnt.mnt_dir = xstrdup(node); remnt.mnt_opts = xstrdup("ro"); @@ -159,9 +96,8 @@ int del_mtab(const char *spec, const char *node) return 0; } else if (errno != EBUSY) { /* hmm ... */ perror("remount"); - fprintf(stderr, - _("umount: could not remount %s read-only\n"), - spec); + nfs_error(_("%s: could not remount %s read-only"), + progname, spec); } } @@ -181,14 +117,11 @@ int del_mtab(const char *spec, const char *node) return 0; if (umnt_err) - complain(umnt_err, node); - return 1; + umount_error(umnt_err, node); + return EX_FILEIO; } -/* - * Returns 1 if everything went well, else 0. - */ -int _nfsumount(const char *spec, const char *opts) +static int do_nfs_umount(const char *spec, char *opts) { char *hostname; char *dirname; @@ -197,11 +130,20 @@ int _nfsumount(const char *spec, const char *opts) struct pmap *pmap = &mnt_server.pmap; char *p; - nfs_mount_version = find_kernel_nfs_mount_version(); - if (spec == NULL || (p = strchr(spec,':')) == NULL) - goto out_bad; - hostname = xstrndup(spec, p-spec); - dirname = xstrdup(p+1); + if (spec == NULL) { + nfs_error(_("%s: No NFS export name was provided"), + progname); + return EX_USAGE; + } + + p = strchr(spec, ':'); + if (p == NULL) { + nfs_error(_("%s: '%s' is not a legal NFS export name"), + progname, spec); + return EX_USAGE; + } + hostname = xstrndup(spec, p - spec); + dirname = xstrdup(p + 1); #ifdef NFS_MOUNT_DEBUG printf(_("host: %s, directory: %s\n"), hostname, dirname); #endif @@ -228,7 +170,6 @@ int _nfsumount(const char *spec, const char *opts) pmap->pm_prog = MOUNTPROG; pmap->pm_vers = MOUNTVERS_NFSV3; - pmap->pm_prot = IPPROTO_TCP; if (opts && (p = strstr(opts, "mountprog=")) && isdigit(*(p+10))) pmap->pm_prog = atoi(p+10); if (opts && (p = strstr(opts, "mountport=")) && isdigit(*(p+10))) @@ -246,11 +187,18 @@ int _nfsumount(const char *spec, const char *opts) if (opts && (hasmntopt(&mnt, "udp") || hasmntopt(&mnt, "proto=udp"))) pmap->pm_prot = IPPROTO_UDP; - if (!nfs_gethostbyname(hostname, &mnt_server.saddr)) - goto out_bad; - return nfs_call_umount(&mnt_server, &dirname); - out_bad: - printf("%s: %s: not found or not mounted\n", progname, spec); + if (!nfs_gethostbyname(hostname, &mnt_server.saddr)) { + nfs_error(_("%s: '%s' does not contain a recognized hostname"), + progname, spec); + return EX_USAGE; + } + + if (!nfs_call_umount(&mnt_server, &dirname)) { + nfs_error(_("%s: Server failed to unmount '%s'"), + progname, spec); + return EX_USAGE; + } + return 0; } @@ -264,7 +212,7 @@ static struct option umount_longopts[] = { NULL, 0, 0, 0 } }; -void umount_usage() +static void umount_usage(void) { printf("usage: %s dir [-fvnrlh]\n", progname); printf("options:\n\t-f\t\tforce unmount\n"); @@ -281,11 +229,17 @@ int nfsumount(int argc, char *argv[]) char *spec; struct mntentchn *mc; + if (argc < 2) { + umount_usage(); + return EX_USAGE; + } + spec = argv[1]; 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) { @@ -308,13 +262,17 @@ int nfsumount(int argc, char *argv[]) case 'h': default: umount_usage(); - return 0; + return EX_USAGE; } } + if (optind != argc) { + umount_usage(); + return EX_USAGE; + } if (spec == NULL || (*spec != '/' && strchr(spec,':') == NULL)) { - printf(_("umount: %s: not found\n"), spec); - return 0; + nfs_error(_("%s: %s: not found\n"), progname, spec); + return EX_USAGE; } if (*spec == '/') @@ -324,18 +282,57 @@ 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) { + nfs_error(_("%s: %s on %s it not an nfs filesystem"), + progname, mc->m.mnt_fsname, mc->m.mnt_dir); + return EX_USAGE; + } + + 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: + nfs_error(_("%s: You are not permitted to unmount %s"), + progname, spec); + return EX_USAGE; + } + 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) - ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts); - if(ret) - ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir); + do_nfs_umount(mc->m.mnt_fsname, mc->m.mnt_opts); + ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir); } else if (*spec != '/') { if (!lazy) - ret = _nfsumount(spec, "tcp,v3"); + do_nfs_umount(spec, "tcp,v3"); } else ret = del_mtab(NULL, spec); - return(ret); + return ret; } -