execute: apply PAM logic only to main process if PermissionsStartOnly is set

https://bugs.freedesktop.org/show_bug.cgi?id=54176

diff --git a/TODO b/TODO
index bdfbffbbf0a3c2ce682efd504d8c373fccc6e3f6..8addd6e291e7c5821955daab50af1b6ade4ce609 100644 (file)
--- a/TODO
+++ b/TODO
@@ -28,8 +28,6 @@ F18:
 
 * Retest multi-seat
 
-* selinux: merge systemd selinux access controls (dwalsh)
-
 Features:
 
 * instantiated target units

diff --git a/src/core/execute.c b/src/core/execute.c
index 6e2b5e48a01c7be317ba292392dd0316656a17fa..cb703cbad8cc5072ad43b1a82285cca8b4602bd9 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1283,7 +1283,7 @@ int exec_spawn(ExecCommand *command,
                 umask(context->umask);
 
 #ifdef HAVE_PAM
-                if (context->pam_name && username) {
+                if (apply_permissions && context->pam_name && username) {
                         err = setup_pam(context->pam_name, username, uid, context->tty_path, &pam_env, fds, n_fds);
                         if (err < 0) {
                                 r = EXIT_PAM;