|
 |
e5de6eb |
--- nfs-utils-1.0.10/utils/mount/nfsumount.c.orig 2006-12-07 10:25:41.000000000 -0500
|
|
|
e5de6eb |
+++ nfs-utils-1.0.10/utils/mount/nfsumount.c 2006-12-11 15:00:29.000000000 -0500
|
|
|
e5de6eb |
@@ -333,7 +333,7 @@ void umount_usage()
|
|
|
e5de6eb |
|
|
|
e5de6eb |
int nfsumount(int argc, char *argv[])
|
|
|
e5de6eb |
{
|
|
|
e5de6eb |
- int c, ret;
|
|
|
e5de6eb |
+ int c, ret, v4=0;
|
|
|
e5de6eb |
char *spec;
|
|
|
e5de6eb |
struct mntentchn *mc;
|
|
|
e5de6eb |
|
|
|
e5de6eb |
@@ -371,39 +371,33 @@ int nfsumount(int argc, char *argv[])
|
|
|
e5de6eb |
mc = getmntdirbackward(spec, NULL);
|
|
|
e5de6eb |
if (!mc)
|
|
|
e5de6eb |
mc = getmntdevbackward(spec, NULL);
|
|
|
e5de6eb |
- if (!mc && verbose)
|
|
|
e5de6eb |
- printf(_("Could not find %s in mtab\n"), spec);
|
|
|
e5de6eb |
-
|
|
|
e5de6eb |
- if(mc) {
|
|
|
e5de6eb |
- if(contains(mc->m.mnt_opts, "user") && getuid() != 0) {
|
|
|
e5de6eb |
- struct passwd *pw = getpwuid(getuid());
|
|
|
e5de6eb |
- if(!pw || strcmp(pw->pw_name, get_value(mc->m.mnt_opts, "user="))) {
|
|
|
e5de6eb |
- fprintf(stderr, "%s: permission denied to unmount %s\n",
|
|
|
e5de6eb |
- progname, spec);
|
|
|
e5de6eb |
- exit(1);
|
|
|
e5de6eb |
- }
|
|
|
e5de6eb |
- } else {
|
|
|
e5de6eb |
- if(!contains(mc->m.mnt_opts, "users") && getuid() != 0) {
|
|
|
e5de6eb |
- fprintf(stderr, "%s: only root can unmount %s from %s\n",
|
|
|
e5de6eb |
- progname, mc->m.mnt_fsname, mc->m.mnt_dir);
|
|
|
e5de6eb |
- exit(1);
|
|
|
e5de6eb |
- }
|
|
|
e5de6eb |
- }
|
|
|
e5de6eb |
-
|
|
|
e5de6eb |
- ret = 0;
|
|
|
e5de6eb |
- if(!force && !lazy)
|
|
|
e5de6eb |
- ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
|
|
|
e5de6eb |
- if(!ret)
|
|
|
e5de6eb |
- ret = add_mtab2(mc->m.mnt_fsname, mc->m.mnt_dir,
|
|
|
e5de6eb |
- mc->m.mnt_type, mc->m.mnt_opts, mc);
|
|
|
e5de6eb |
+ if (mc == NULL) {
|
|
|
e5de6eb |
+ fprintf(stderr, "%s: Unable to find '%s' in mount table\n",
|
|
|
e5de6eb |
+ progname, spec);
|
|
|
e5de6eb |
+ exit(1);
|
|
|
e5de6eb |
}
|
|
|
e5de6eb |
- else {
|
|
|
e5de6eb |
- ret = 0;
|
|
|
e5de6eb |
- if(!force && !lazy)
|
|
|
e5de6eb |
- ret = _nfsumount(spec, NULL);
|
|
|
e5de6eb |
- if(!ret)
|
|
|
e5de6eb |
- ret = add_mtab2(spec, spec, spec, spec, NULL);
|
|
|
e5de6eb |
+ if(contains(mc->m.mnt_opts, "user") && getuid() != 0) {
|
|
|
e5de6eb |
+ struct passwd *pw = getpwuid(getuid());
|
|
|
e5de6eb |
+ if(!pw || strcmp(pw->pw_name, get_value(mc->m.mnt_opts, "user="))) {
|
|
|
e5de6eb |
+ fprintf(stderr, "%s: permission denied to unmount %s\n",
|
|
|
e5de6eb |
+ progname, spec);
|
|
|
e5de6eb |
+ exit(1);
|
|
|
e5de6eb |
+ }
|
|
|
e5de6eb |
+ } else {
|
|
|
e5de6eb |
+ if(!contains(mc->m.mnt_opts, "users") && getuid() != 0) {
|
|
|
e5de6eb |
+ fprintf(stderr, "%s: only root can unmount %s from %s\n",
|
|
|
e5de6eb |
+ progname, mc->m.mnt_fsname, mc->m.mnt_dir);
|
|
|
e5de6eb |
+ exit(1);
|
|
|
e5de6eb |
+ }
|
|
|
e5de6eb |
}
|
|
|
e5de6eb |
+ v4 = contains(mc->m.mnt_type, "nfs4");
|
|
|
e5de6eb |
+
|
|
|
e5de6eb |
+ ret = 0;
|
|
|
e5de6eb |
+ if(!force && !lazy && !v4)
|
|
|
e5de6eb |
+ ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
|
|
|
e5de6eb |
+ if(!ret)
|
|
|
e5de6eb |
+ ret = add_mtab2(mc->m.mnt_fsname, mc->m.mnt_dir,
|
|
|
e5de6eb |
+ mc->m.mnt_type, mc->m.mnt_opts, mc);
|
|
|
e5de6eb |
|
|
|
e5de6eb |
return(ret);
|
|
|
e5de6eb |
}
|