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 0fc2b417007ac73800e6c67e4a3807fd61d30a34..782cf0fec76ea46cac2958cf5667eb28d2065d22 100644 (file)
--- 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 d0c41ba1055f05f6878ccf8a3f0c1211691d5f69..12cae0c11dc86c62c6fa92a2e090e6609ba4f738 100644 (file)
--- 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;