From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 6 Aug 2016 20:41:35 +0000 (-0400)
Subject: Merge pull request #3884 from poettering/private-users
X-Git-Tag: v232~317
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d87a2ef78277177b363f3d603221183d22811a82;p=thirdparty%2Fsystemd.git

Merge pull request #3884 from poettering/private-users
---

d87a2ef78277177b363f3d603221183d22811a82
diff --cc src/core/execute.c
index 7aafb1b0580,cec3b3cf40b..6019df7ea69
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@@ -2079,6 -2191,14 +2233,14 @@@ static int exec_child
          }
  #endif
  
 -        if (params->apply_permissions && context->private_users) {
++        if ((params->flags & EXEC_APPLY_PERMISSIONS) && context->private_users) {
+                 r = setup_private_users(uid, gid);
+                 if (r < 0) {
+                         *exit_status = EXIT_USER;
+                         return r;
+                 }
+         }
+ 
          /* We repeat the fd closing here, to make sure that
           * nothing is leaked from the PAM modules. Note that
           * we are more aggressive this time since socket_fd