chase-symlinks: honour CHASE_NOFOLLOW flag properly in some cases

diff --git a/src/basic/chase-symlinks.c b/src/basic/chase-symlinks.c
index e93419d63595dfa5c0dd5a2168fd707ec815f775..ab80e766885802349ae47efd5537ec28297e2f20 100644 (file)
--- a/src/basic/chase-symlinks.c
+++ b/src/basic/chase-symlinks.c
@@ -422,7 +422,7 @@ int chase_symlinks_and_open(
 
         if (empty_or_root(root) && !ret_path && (chase_flags & (CHASE_NO_AUTOFS|CHASE_SAFE)) == 0) {
                 /* Shortcut this call if none of the special features of this call are requested */
-                r = open(path, open_flags);
+                r = open(path, open_flags | (FLAGS_SET(chase_flags, CHASE_NOFOLLOW) ? O_NOFOLLOW : 0));
                 if (r < 0)
                         return -errno;
 
@@ -507,7 +507,8 @@ int chase_symlinks_and_stat(
 
         if (empty_or_root(root) && !ret_path && (chase_flags & (CHASE_NO_AUTOFS|CHASE_SAFE)) == 0) {
                 /* Shortcut this call if none of the special features of this call are requested */
-                if (stat(path, ret_stat) < 0)
+
+                if (fstatat(AT_FDCWD, path, ret_stat, FLAGS_SET(chase_flags, CHASE_NOFOLLOW) ? AT_SYMLINK_NOFOLLOW : 0) < 0)
                         return -errno;
 
                 return 1;