X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fexecute.c;h=f535b4778a5305fc863efe167ded4e1757d0f61e;hb=e7bc519620cb7bcdbe2166fc2a446453769d827e;hp=4b0767aed3151946f63653bc973503fe744e0d75;hpb=8fa6cbe1a9f3f3353224116772619a4d3eb26f88;p=elogind.git diff --git a/src/core/execute.c b/src/core/execute.c index 4b0767aed..f535b4778 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1785,7 +1785,7 @@ int exec_spawn(ExecCommand *command, n_fds = params->n_fds; } - err = exec_context_load_environment(context, &files_env); + err = exec_context_load_environment(context, params->unit_id, &files_env); if (err < 0) { log_struct_unit(LOG_ERR, params->unit_id, @@ -2014,7 +2014,7 @@ void exec_command_free_array(ExecCommand **c, unsigned n) { } } -int exec_context_load_environment(const ExecContext *c, char ***l) { +int exec_context_load_environment(const ExecContext *c, const char *unit_id, char ***l) { char **i, **r = NULL; assert(c); @@ -2071,7 +2071,7 @@ int exec_context_load_environment(const ExecContext *c, char ***l) { } /* Log invalid environment variables with filename */ if (p) - p = strv_env_clean_log(p, pglob.gl_pathv[n]); + p = strv_env_clean_log(p, unit_id, pglob.gl_pathv[n]); if (r == NULL) r = p;