execute: properly pass PAM environment to executed process

[elogind.git] / src / execute.c

diff --git a/src/execute.c b/src/execute.c
index d297e0a9e65c2d23096fafa0dee504009defb059..9c390c0bcee4218a67586da5994ae4dab126f3a6 100644 (file)
--- 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