summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/execute.c21
-rw-r--r--src/shared/env-util.c11
-rw-r--r--src/shared/env-util.h4
-rw-r--r--src/test/test-fileio.c2
4 files changed, 25 insertions, 13 deletions
diff --git a/src/core/execute.c b/src/core/execute.c
index c472dadfed..a806d42827 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2026,6 +2026,17 @@ void exec_command_free_array(ExecCommand **c, unsigned n) {
c[i] = exec_command_free_list(c[i]);
}
+typedef struct InvalidEnvInfo {
+ const char *unit_id;
+ const char *path;
+} InvalidEnvInfo;
+
+static void invalid_env(const char *p, void *userdata) {
+ InvalidEnvInfo *info = userdata;
+
+ log_unit_error(info->unit_id, "Ignoring invalid environment assignment '%s': %s", p, info->path);
+}
+
int exec_context_load_environment(const ExecContext *c, const char *unit_id, char ***l) {
char **i, **r = NULL;
@@ -2082,8 +2093,14 @@ int exec_context_load_environment(const ExecContext *c, const char *unit_id, cha
return k;
}
/* Log invalid environment variables with filename */
- if (p)
- p = strv_env_clean_log(p, unit_id, pglob.gl_pathv[n]);
+ if (p) {
+ InvalidEnvInfo info = {
+ .unit_id = unit_id,
+ .path = pglob.gl_pathv[n]
+ };
+
+ p = strv_env_clean_with_callback(p, invalid_env, &info);
+ }
if (r == NULL)
r = p;
diff --git a/src/shared/env-util.c b/src/shared/env-util.c
index fbdc73dd2c..038246d21b 100644
--- a/src/shared/env-util.c
+++ b/src/shared/env-util.c
@@ -28,7 +28,6 @@
#include "util.h"
#include "env-util.h"
#include "def.h"
-#include "unit.h"
#define VALID_CHARS_ENV_NAME \
DIGITS LETTERS \
@@ -415,7 +414,7 @@ char *strv_env_get(char **l, const char *name) {
return strv_env_get_n(l, name, strlen(name));
}
-char **strv_env_clean_log(char **e, const char *unit_id, const char *message) {
+char **strv_env_clean_with_callback(char **e, void (*invalid_callback)(const char *p, void *userdata), void *userdata) {
char **p, **q;
int k = 0;
@@ -424,8 +423,8 @@ char **strv_env_clean_log(char **e, const char *unit_id, const char *message) {
bool duplicate = false;
if (!env_assignment_is_valid(*p)) {
- if (message)
- log_unit_error(unit_id, "Ignoring invalid environment '%s': %s", *p, message);
+ if (invalid_callback)
+ invalid_callback(*p, userdata);
free(*p);
continue;
}
@@ -450,7 +449,3 @@ char **strv_env_clean_log(char **e, const char *unit_id, const char *message) {
return e;
}
-
-char **strv_env_clean(char **e) {
- return strv_env_clean_log(e, NULL, NULL);
-}
diff --git a/src/shared/env-util.h b/src/shared/env-util.h
index 3c6f9d743f..fb3a52b707 100644
--- a/src/shared/env-util.h
+++ b/src/shared/env-util.h
@@ -29,8 +29,8 @@ bool env_value_is_valid(const char *e);
bool env_assignment_is_valid(const char *e);
bool strv_env_is_valid(char **e);
-char **strv_env_clean(char **l);
-char **strv_env_clean_log(char **e, const char *unit_id, const char *message);
+#define strv_env_clean(l) strv_env_clean_with_callback(l, NULL, NULL)
+char **strv_env_clean_with_callback(char **l, void (*invalid_callback)(const char *p, void *userdata), void *userdata);
bool strv_env_name_or_assignment_is_valid(char **l);
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index cdf1973ea5..63e4a19b76 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -90,7 +90,7 @@ static void test_parse_env_file(void) {
assert_se(streq_ptr(a[9], "ten="));
assert_se(a[10] == NULL);
- strv_env_clean_log(a, NULL, "test");
+ strv_env_clean(a);
k = 0;
STRV_FOREACH(i, b) {