From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 30 Jun 2011 02:31:34 +0000 (+0200)
Subject: execute: properly pass PAM environment to executed process
X-Git-Tag: v30~83
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=aa87e624744cb7fbd9e28e70e855e28fd3b255c2

execute: properly pass PAM environment to executed process
---

diff --git a/src/execute.c b/src/execute.c
index d297e0a9e..9c390c0bc 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -898,6 +898,9 @@ static int setup_pam(
          * might have opened it, but we don't want this fd around. */
         closelog();
 
+        *pam_env = e;
+        e = NULL;
+
         return 0;
 
 fail:
@@ -1063,7 +1066,7 @@ int exec_spawn(ExecCommand *command,
 
                 /* This string must fit in 10 chars (i.e. the length
                  * of "/sbin/init") */
-                rename_process("sd.exec");
+                rename_process("sd(EXEC)");
 
                 /* We reset exactly these signals, since they are the
                  * only ones we set to SIG_IGN in the main daemon. All