From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 18 Apr 2018 16:46:44 +0000 (+0200)
Subject: Merge pull request #8708 from poettering/namespace-repeat
X-Git-Tag: v239~391
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7aab22308e0a95a7ad6f73be5fca2ba5c797ab8d;p=thirdparty%2Fsystemd.git

Merge pull request #8708 from poettering/namespace-repeat

pid1 namespacing fixes
---

7aab22308e0a95a7ad6f73be5fca2ba5c797ab8d
diff --cc src/basic/fs-util.c
index c6708a4c58c,3dc194ca6e7..61aeb1fc8a2
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@@ -611,13 -618,34 +614,34 @@@ int chase_symlinks(const char *path, co
           * Suggested usage: whenever you want to canonicalize a path, use this function. Pass the absolute path you got
           * as-is: fully qualified and relative to your host's root. Optionally, specify the root parameter to tell this
           * function what to do when encountering a symlink with an absolute path as directory: prefix it by the
-          * specified path. */
+          * specified path.
+          *
+          * There are three ways to invoke this function:
+          *
+          * 1. Without CHASE_STEP or CHASE_OPEN: in this case the path is resolved and the normalized path is returned
+          *    in `ret`. The return value is < 0 on error. If CHASE_NONEXISTENT is also set 0 is returned if the file
+          *    doesn't exist, > 0 otherwise. If CHASE_NONEXISTENT is not set >= 0 is returned if the destination was
+          *    found, -ENOENT if it doesn't.
+          *
+          * 2. With CHASE_OPEN: in this case the destination is opened after chasing it as O_PATH and this file
+          *    descriptor is returned as return value. This is useful to open files relative to some root
+          *    directory. Note that the returned O_PATH file descriptors must be converted into a regular one (using
+          *    fd_reopen() or such) before it can be used for reading/writing. CHASE_OPEN may not be combined with
+          *    CHASE_NONEXISTENT.
+          *
+          * 3. With CHASE_STEP: in this case only a single step of the normalization is executed, i.e. only the first
+          *    symlink or ".." component of the path is resolved, and the resulting path is returned. This is useful if
+          *    a caller wants to trace the a path through the file system verbosely. Returns < 0 on error, > 0 if the
+          *    path is fully normalized, and == 0 for each normalization step. This may be combined with
+          *    CHASE_NONEXISTENT, in which case 1 is returned when a component is not found.
+          *
+          * */
  
          /* A root directory of "/" or "" is identical to none */
 -        if (noop_root(original_root))
 +        if (empty_or_root(original_root))
                  original_root = NULL;
  
-         if (!original_root && !ret && (flags & (CHASE_NONEXISTENT|CHASE_NO_AUTOFS|CHASE_SAFE|CHASE_OPEN)) == CHASE_OPEN) {
+         if (!original_root && !ret && (flags & (CHASE_NONEXISTENT|CHASE_NO_AUTOFS|CHASE_SAFE|CHASE_OPEN|CHASE_STEP)) == CHASE_OPEN) {
                  /* Shortcut the CHASE_OPEN case if the caller isn't interested in the actual path and has no root set
                   * and doesn't care about any of the other special features we provide either. */
                  r = open(path, O_PATH|O_CLOEXEC);