From 65ffef3689fd220e4e0d34d33f3372cdd30358bb Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 21 Mar 2005 22:13:32 -0500 Subject: [PATCH] Ignore the BLKID_FILE environment variable if blkid_get_cache() is called from a setuid program. --- lib/blkid/ChangeLog | 6 ++++++ lib/blkid/cache.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog index 0fc2b41..782cf0f 100644 --- a/lib/blkid/ChangeLog +++ b/lib/blkid/ChangeLog @@ -1,3 +1,9 @@ +2005-03-21 Theodore Ts'o + + * 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 * getsize.c (blkid_get_dev_size): Fix compilation problem on diff --git a/lib/blkid/cache.c b/lib/blkid/cache.c index d0c41ba..12cae0c 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; -- 1.8.3.1