diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2005-03-21 22:13:32 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2005-03-21 22:13:32 -0500 |
| commit | 65ffef3689fd220e4e0d34d33f3372cdd30358bb (patch) | |
| tree | a676aab255ce2e29ddf0a0984c63de03419b3ac9 /lib/blkid | |
| parent | d72e954f45aa9ee6f4c19f6e24e711b3578bfbbf (diff) | |
| download | e2fsprogs-65ffef3689fd220e4e0d34d33f3372cdd30358bb.tar.gz | |
Ignore the BLKID_FILE environment variable if blkid_get_cache() is
called from a setuid program.
Diffstat (limited to 'lib/blkid')
| -rw-r--r-- | lib/blkid/ChangeLog | 6 | ||||
| -rw-r--r-- | lib/blkid/cache.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog index 0fc2b417..782cf0fe 100644 --- a/lib/blkid/ChangeLog +++ b/lib/blkid/ChangeLog @@ -1,3 +1,9 @@ +2005-03-21 Theodore Ts'o <tytso@mit.edu> + + * cache.c (blkid_get_cache): Ignore the BLKID_FILE environment + variable if blkid_get_cache() is called from a setuid + program. + 2005-03-16 Theodore Ts'o <tytso@mit.edu> * getsize.c (blkid_get_dev_size): Fix compilation problem on diff --git a/lib/blkid/cache.c b/lib/blkid/cache.c index d0c41ba1..12cae0c1 100644 --- a/lib/blkid/cache.c +++ b/lib/blkid/cache.c @@ -41,7 +41,7 @@ int blkid_get_cache(blkid_cache *ret_cache, const char *filename) if (filename && !strlen(filename)) filename = 0; - if (!filename) + if (!filename && (getuid() == geteuid())) filename = getenv("BLKID_FILE"); if (!filename) filename = BLKID_CACHE_FILE; |