summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-06-30 04:31:34 +0200
committerLennart Poettering <lennart@poettering.net>2011-06-30 04:31:34 +0200
commitaa87e624744cb7fbd9e28e70e855e28fd3b255c2 (patch)
tree2296ace552fd26ded6e5f592ec05eb34d8823d68
parent9a0e68963464b6bc159cad53fd745491cd0b90f7 (diff)
execute: properly pass PAM environment to executed process
-rw-r--r--src/execute.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/execute.c b/src/execute.c
index d297e0a9e6..9c390c0bce 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