From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 18 Sep 2012 08:54:23 +0000 (+0200)
Subject: execute: apply PAM logic only to main process if PermissionsStartOnly is set
X-Git-Tag: v190~39
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b7848021c3b058086243071b122077fc4fa1106e

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 bdfbffbbf..8addd6e29 100644
--- 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 6e2b5e48a..cb703cbad 100644
--- 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;