From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 2 Dec 2022 16:53:27 +0000 (+0100)
Subject: Revert "basic: add fallback in chase_symlinks_and_opendir() for cases when /proc... 
X-Git-Tag: v253-rc1~383
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fe6e5c1127451554779f29d5e1aea2c557d1c37;p=thirdparty%2Fsystemd.git

Revert "basic: add fallback in chase_symlinks_and_opendir() for cases when /proc is not mounted"

This reverts commit 3e22dfc2352bb5c4f058e23a82f424655b599b18.
---

diff --git a/src/basic/chase-symlinks.c b/src/basic/chase-symlinks.c
index 118a6ee68f8..0bb07000bad 100644
--- a/src/basic/chase-symlinks.c
+++ b/src/basic/chase-symlinks.c
@@ -552,22 +552,14 @@ int chase_symlinks_and_opendir(
                 return 0;
         }
 
-        r = chase_symlinks(path, root, chase_flags, &p, &path_fd);
+        r = chase_symlinks(path, root, chase_flags, ret_path ? &p : NULL, &path_fd);
         if (r < 0)
                 return r;
         assert(path_fd >= 0);
 
         d = opendir(FORMAT_PROC_FD_PATH(path_fd));
-        if (!d) {
-                /* Hmm, we have the fd already but we got ENOENT, most likely /proc is not mounted.
-                 * Let's try opendir() again on the full path. */
-                if (errno == ENOENT) {
-                        d = opendir(p);
-                        if (!d)
-                                return -errno;
-                } else
-                        return -errno;
-        }
+        if (!d)
+                return -errno;
 
         if (ret_path)
                 *ret_path = TAKE_PTR(p);