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

diff --git a/ChangeLog b/ChangeLog
index 10483ba2d12b5885915c40cea44c58ee72414c84..42a8f9ad4fcab1bd2d0930591e85d181ec483c59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 73b1d9be99b32b7dd4862e98266aaf512d030c55..3a7aa7720256edd6f2f68937617ce00deada7126 100644 (file)
--- 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);