X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=execute.c;fp=execute.c;h=a7775a4ea9f552cdc1defeecf3ba941775373372;hb=1137a57c2677936bab56c26591a42c93a5e670a8;hp=7192abfffb8cc7776735841920dbcfe132cdc111;hpb=6e620becc8543e9ea8381fcd779dd932c2464749;p=elogind.git

diff --git a/execute.c b/execute.c
index 7192abfff..a7775a4ea 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;
                 }