From fe9cea3352b919f81ead0de5487ed593325b2ef0 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Wed, 5 Oct 2011 17:52:06 +0200
Subject: Add option to follow symlinks to check_file()

---
 src/util/check_and_open.c | 5 +++--
 src/util/util.h           | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/util')

diff --git a/src/util/check_and_open.c b/src/util/check_and_open.c
index db926f10..27ef1c88 100644
--- a/src/util/check_and_open.c
+++ b/src/util/check_and_open.c
@@ -35,7 +35,7 @@ static errno_t perform_checks(struct stat *stat_buf,
 
 errno_t check_file(const char *filename, const int uid, const int gid,
                    const int mode, enum check_file_type type,
-                   struct stat *caller_stat_buf)
+                   struct stat *caller_stat_buf, bool follow_symlink)
 {
     int ret;
     struct stat local_stat_buf;
@@ -47,7 +47,8 @@ errno_t check_file(const char *filename, const int uid, const int gid,
         stat_buf = caller_stat_buf;
     }
 
-    ret = lstat(filename, stat_buf);
+    ret = follow_symlink ? stat(filename, stat_buf) : \
+                           lstat(filename, stat_buf);
     if (ret == -1) {
         DEBUG(1, ("lstat for [%s] failed: [%d][%s].\n", filename, errno,
                                                         strerror(errno)));
diff --git a/src/util/util.h b/src/util/util.h
index 6cc8a546..9a006471 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -429,7 +429,7 @@ enum check_file_type {
  */
 errno_t check_file(const char *filename, const int uid, const int gid,
                    const int mode, enum check_file_type type,
-                   struct stat *caller_stat_buf);
+                   struct stat *caller_stat_buf, bool follow_symlink);
 
 /* check_fd()
  * Verify that an open file descriptor has certain permissions and/or
-- 
cgit