diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2011-08-31 12:55:06 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@suse.cz> | 2011-09-13 10:41:44 +0200 |
| commit | 5ac2b222047e9c7bf8147be3964cd76da7064fba (patch) | |
| tree | 058489b38960094a13abdbc90824b15c640cb4db | |
| parent | e9e5a1cb32ff7205e9621b32c5994e3a587b8213 (diff) | |
| download | fuse-5ac2b222047e9c7bf8147be3964cd76da7064fba.tar.gz | |
Don't ignore --disable-mtab
If configured with --disable-mtab then don't call mount(8) from
libfuse to update the mtab.
Reported by: James Sierp
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mount.c | 2 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2011-08-26 Miklos Szeredi <miklos@szeredi.hu> + + * If configured with --disable-mtab then don't call mount(8) from + libfuse to update the mtab. Reported by: James Sierp + 2011-01-31 Miklos Szeredi <miklos@szeredi.hu> * Released 2.8.6 diff --git a/lib/mount.c b/lib/mount.c index 73b1d9b..3a7aa77 100644 --- a/lib/mount.c +++ b/lib/mount.c @@ -484,6 +484,7 @@ static int fuse_mount_sys(const char *mnt, struct mount_opts *mo, goto out_close; } +#ifndef IGNORE_MTAB if (geteuid() == 0) { char *newmnt = fuse_mnt_resolve_path("fuse", mnt); res = -1; @@ -496,6 +497,7 @@ static int fuse_mount_sys(const char *mnt, struct mount_opts *mo, if (res == -1) goto out_umount; } +#endif /* IGNORE_MTAB */ free(type); free(source); |