From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 22 Mar 2005 03:13:32 +0000 (-0500)
Subject: Ignore the BLKID_FILE environment variable if blkid_get_cache() is
X-Git-Tag: E2FSPROGS-1_37~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65ffef3689fd220e4e0d34d33f3372cdd30358bb;p=thirdparty%2Fe2fsprogs.git

Ignore the BLKID_FILE environment variable if blkid_get_cache() is
called from a setuid program.
---

diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog
index 0fc2b4170..782cf0fec 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 d0c41ba10..12cae0c11 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;