summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2011-08-31 12:55:06 +0200
committerMiklos Szeredi <mszeredi@suse.cz>2011-08-31 12:55:06 +0200
commit0131407f4e1a376b9165adca656d799c30af6311 (patch)
treef18ac5cb56b5c0c12ed7cdb66275933270006c41
parent394380fe50cf1a2295b019fad46035bf8f972d6f (diff)
downloadfuse-0131407f4e1a376b9165adca656d799c30af6311.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--ChangeLog5
-rw-r--r--lib/mount.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ce030c..655bee8 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-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 a159a14..be7b4cb 100644
--- 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);