From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 Sep 2017 11:01:33 +0000 (+0200)
Subject: nspawn: properly report all kinds of changed UID/GID when patching things for userns
X-Git-Tag: v235~36^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64fbdc0f91f77908c63386f3db4d58e007a78963;p=platform%2Fupstream%2Fsystemd.git

nspawn: properly report all kinds of changed UID/GID when patching things for userns

We forgot to propagate one chmod().
---

diff --git a/src/nspawn/nspawn-patch-uid.c b/src/nspawn/nspawn-patch-uid.c
index 1a3f129..f861db8 100644
--- a/src/nspawn/nspawn-patch-uid.c
+++ b/src/nspawn/nspawn-patch-uid.c
@@ -347,6 +347,8 @@ static int recurse_fd(int fd, bool donate_fd, const struct stat *st, uid_t shift
         }
         if (r < 0)
                 goto finish;
+        if (r > 0)
+                changed = true;
 
         if (S_ISDIR(st->st_mode)) {
                 _cleanup_closedir_ DIR *d = NULL;