]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #3884 from poettering/private-users
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 6 Aug 2016 20:41:35 +0000 (16:41 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 6 Aug 2016 21:04:45 +0000 (17:04 -0400)
1  2 
TODO
man/systemd.exec.xml
src/core/dbus-execute.c
src/core/execute.c
src/core/execute.h
src/shared/bus-unit-util.c

diff --cc TODO
Simple merge
Simple merge
Simple merge
index 7aafb1b058068d2bb59731962268ac0c1d5b43b9,cec3b3cf40bfd268074c68a97f3134bbbefec3db..6019df7ea695a0307c003e62a28fef6baafe7c5d
@@@ -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
Simple merge
Simple merge