summaryrefslogtreecommitdiff
path: root/execute.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-05-09 23:53:52 +0200
committerLennart Poettering <lennart@poettering.net>2010-05-09 23:53:52 +0200
commit1137a57c2677936bab56c26591a42c93a5e670a8 (patch)
tree52a4b49bae3558526bcede18fbc3aba48857a967 /execute.c
parent6e620becc8543e9ea8381fcd779dd932c2464749 (diff)
environment: allow control of the environment block via D-Bus
Diffstat (limited to 'execute.c')
-rw-r--r--execute.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/execute.c b/execute.c
index 7192abfffb..a7775a4ea9 100644
--- a/execute.c
+++ b/execute.c
@@ -724,6 +724,7 @@ int exec_spawn(ExecCommand *command,
char **argv,
const ExecContext *context,
int fds[], unsigned n_fds,
+ char **environment,
bool apply_permissions,
bool apply_chroot,
bool confirm_spawn,
@@ -1034,7 +1035,7 @@ int exec_spawn(ExecCommand *command,
goto fail;
}
- if (!(final_env = strv_env_merge(environ, our_env, context->environment, NULL))) {
+ if (!(final_env = strv_env_merge(environment, our_env, context->environment, NULL))) {
r = EXIT_MEMORY;
goto fail;
}