openharmony/third_party_libfuse
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_libfuse.git synced 2026-07-18 18:44:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

fusermount: don't try to create a lock file if /etc/mtab is a symlink

Browse Source
This commit is contained in:
Miklos Szeredi
2006-10-18 08:17:08 +00:00
parent dcfb821450
commit 87ad64c3dd
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2006-10-18 Miklos Szeredi <miklos@szeredi.hu>
* fusermount: don't try to create a lock file if /etc/mtab is a
symlink. Report and patch from Alexei Sheplyakov (debian bug
#393693)
2006-10-17 Miklos Szeredi <miklos@szeredi.hu>
* Minor changes, sync with mainline tree
util/fusermount.c
+8 -6
View File
@@ -108,6 +108,13 @@ static int lock_mtab(void)
const char *mtab_lock = _PATH_MOUNTED ".fuselock";
int mtablock;
int res;
struct stat mtab_stat;
/* /etc/mtab could be a symlink to /proc/mounts */
if (!lstat(_PATH_MOUNTED, &mtab_stat)) {
if (S_ISLNK(mtab_stat.st_mode))
return -1;
}
mtablock = open(mtab_lock, O_RDWR | O_CREAT, 0600);
if (mtablock >= 0) {
@@ -880,13 +887,8 @@ static int mount_fuse(const char *mnt, const char *opts)
if (fd == -1)
return -1;
if (geteuid() == 0) {
if (geteuid() == 0)
mtablock = lock_mtab();
if (mtablock < 0) {
close(fd);
return -1;
}
}
drop_privs();
read_conf();