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 9ce030c859e3e66aea8046f14d68ac6b2a0e46f3..655bee8ec3be87d384f469e8c35aac086e7f7ae5 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-08-24  Miklos Szeredi <miklos@szeredi.hu>
 
        * Use LRU list for cleaning up the cache if the "remember=T"

diff --git a/lib/mount.c b/lib/mount.c
index a159a14a73fc3bc86b94435231a45966b2cb1bd0..be7b4cb7808d728bf5685fae572d5929a49d71fc 100644 (file)
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -523,6 +523,7 @@ static int fuse_mount_sys(const char *mnt, struct mount_opts *mo,
        }
 
 #ifndef __NetBSD__
+#ifndef IGNORE_MTAB
        if (geteuid() == 0) {
                char *newmnt = fuse_mnt_resolve_path("fuse", mnt);
                res = -1;
@@ -535,6 +536,7 @@ static int fuse_mount_sys(const char *mnt, struct mount_opts *mo,
                if (res == -1)
                        goto out_umount;
        }
+#endif /* IGNORE_MTAB */
 #endif /* __NetBSD__ */
        free(type);
        free(source);