From: Miklos Szeredi <mszeredi@suse.cz>
Date: Wed, 31 Aug 2011 10:55:06 +0000 (+0200)
Subject: Don't ignore --disable-mtab
X-Git-Tag: fuse_2_8_6~1
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5ac2b222047e9c7bf8147be3964cd76da7064fba;p=qemu-gpiodev%2Flibfuse.git

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 10483ba..42a8f9a 100644
--- 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 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);