diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/load-dropin.c | 40 | ||||
| -rw-r--r-- | src/core/machine-id-setup.c | 30 |
2 files changed, 43 insertions, 27 deletions
diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c index 0318296f1f..a877e66098 100644 --- a/src/core/load-dropin.c +++ b/src/core/load-dropin.c @@ -31,7 +31,12 @@ #include "load-fragment.h" #include "conf-files.h" -static int iterate_dir(Unit *u, const char *path, UnitDependency dependency, char ***strv) { +static int iterate_dir( + Unit *u, + const char *path, + UnitDependency dependency, + char ***strv) { + _cleanup_closedir_ DIR *d = NULL; int r; @@ -86,7 +91,14 @@ static int iterate_dir(Unit *u, const char *path, UnitDependency dependency, cha return 0; } -static int process_dir(Unit *u, const char *unit_path, const char *name, const char *suffix, UnitDependency dependency, char ***strv) { +static int process_dir( + Unit *u, + const char *unit_path, + const char *name, + const char *suffix, + UnitDependency dependency, + char ***strv) { + int r; char *path; @@ -97,7 +109,7 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c path = strjoin(unit_path, "/", name, suffix, NULL); if (!path) - return -ENOMEM; + return log_oom(); if (u->manager->unit_path_cache && !set_get(u->manager->unit_path_cache, path)) @@ -115,13 +127,13 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c template = unit_name_template(name); if (!template) - return -ENOMEM; + return log_oom(); path = strjoin(unit_path, "/", template, suffix, NULL); free(template); if (!path) - return -ENOMEM; + return log_oom(); if (u->manager->unit_path_cache && !set_get(u->manager->unit_path_cache, path)) @@ -138,10 +150,10 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c } char **unit_find_dropin_paths(Unit *u) { - Iterator i; - char *t; _cleanup_strv_free_ char **strv = NULL; char **configs = NULL; + Iterator i; + char *t; int r; assert(u); @@ -157,14 +169,14 @@ char **unit_find_dropin_paths(Unit *u) { } } - if (!strv_isempty(strv)) { - r = conf_files_list_strv(&configs, ".conf", NULL, (const char**) strv); - if (r < 0) { - log_error("Failed to get list of configuration files: %s", strerror(-r)); - strv_free(configs); - return NULL; - } + if (strv_isempty(strv)) + return NULL; + r = conf_files_list_strv(&configs, ".conf", NULL, (const char**) strv); + if (r < 0) { + log_error("Failed to get list of configuration files: %s", strerror(-r)); + strv_free(configs); + return NULL; } return configs; diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c index 608b0a5e7e..18e015fe7f 100644 --- a/src/core/machine-id-setup.c +++ b/src/core/machine-id-setup.c @@ -72,16 +72,19 @@ static int generate(char id[34]) { /* First, try reading the D-Bus machine id, unless it is a symlink */ fd = open("/var/lib/dbus/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW); if (fd >= 0) { - - k = loop_read(fd, id, 32, false); + k = loop_read(fd, id, 33, false); close_nointr_nofail(fd); - if (k >= 32) { - id[32] = '\n'; - id[33] = 0; + if (k == 33 && id[32] == '\n') { - log_info("Initializing machine ID from D-Bus machine ID."); - return 0; + id[32] = 0; + if (id128_is_valid(id)) { + id[32] = '\n'; + id[33] = 0; + + log_info("Initializing machine ID from D-Bus machine ID."); + return 0; + } } } @@ -113,7 +116,7 @@ static int generate(char id[34]) { * $container_uuid the way libvirt/LXC does it */ r = detect_container(NULL); if (r > 0) { - char *e; + _cleanup_free_ char *e = NULL; r = getenv_for_pid(1, "container_uuid", &e); if (r > 0) { @@ -121,12 +124,9 @@ static int generate(char id[34]) { r = shorten_uuid(id, e); if (r >= 0) { log_info("Initializing machine ID from container UUID."); - free(e); return 0; } } - - free(e); } } @@ -183,8 +183,12 @@ int machine_id_setup(void) { } if (S_ISREG(st.st_mode)) - if (loop_read(fd, id, 32, false) >= 32) - return 0; + if (loop_read(fd, id, 33, false) == 33 && id[32] == '\n') { + id[32] = 0; + + if (id128_is_valid(id)) + return 0; + } /* Hmm, so, the id currently stored is not useful, then let's * generate one */ |