*
*/
+#include <unistd.h>
#include <stdio.h>
#include <errno.h>
#include <getopt.h>
#include <mntent.h>
#include <sys/mount.h>
#include <ctype.h>
+#include <pwd.h>
#include "xcommon.h"
#include "fstab.h"
#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 <linux/mount.h> -- lots of errors */
#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 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)
{
int umnt_err, res;
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");
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);
}
}
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)
+int _nfsumount(const char *spec, char *opts)
{
char *hostname;
char *dirname;
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);
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)))
goto out_bad;
return nfs_call_umount(&mnt_server, &dirname);
out_bad:
- printf("%s: %s: not found or not mounted\n", progname, spec);
+ nfs_error(_("%s: %s: not found or not mounted"), progname, spec);
return 0;
}
{ NULL, 0, 0, 0 }
};
-void umount_usage()
+void umount_usage(void)
{
printf("usage: %s dir [-fvnrlh]\n", progname);
printf("options:\n\t-f\t\tforce unmount\n");
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) {
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 == '/')
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);
+ _nfsumount(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");
+ _nfsumount(spec, "tcp,v3");
} else
ret = del_mtab(NULL, spec);
- return(ret);
+ return ret;
}
-
projects / nfs-utils.git / blobdiff