shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

core: use correct scope of looking up units

Browse Source 
Fixes a bug introduced by 3b3557c410.

Fixes #25625.
This commit is contained in:
Yu Watanabe 2022-12-07 12:01:59 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent 31d4258011
commit 47c57b4813
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/dbus-manager.c
View File

@ -2629,11 +2629,10 @@ static int method_add_dependency_unit_files(sd_bus_message *message, void *userd
static int method_get_unit_file_links(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int method_get_unit_file_links(sd_bus_message *message, void *userdata, sd_bus_error *error) {
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
Manager *m = ASSERT_PTR(userdata);
InstallChange *changes = NULL; InstallChange *changes = NULL;
size_t n_changes = 0, i; size_t n_changes = 0, i;
UnitFileFlags flags;
const char *name; const char *name;
char **p;
int runtime, r; int runtime, r;
r = sd_bus_message_read(message, "sb", &name, &runtime); r = sd_bus_message_read(message, "sb", &name, &runtime);
@ -2648,11 +2647,9 @@ static int method_get_unit_file_links(sd_bus_message *message, void *userdata, s
if (r < 0) if (r < 0)
return r; return r;
p = STRV_MAKE(name); r = unit_file_disable(m->unit_file_scope,
flags = UNIT_FILE_DRY_RUN | UNIT_FILE_DRY_RUN | (runtime ? UNIT_FILE_RUNTIME : 0),
(runtime ? UNIT_FILE_RUNTIME : 0); NULL, STRV_MAKE(name), &changes, &n_changes);
r = unit_file_disable(LOOKUP_SCOPE_SYSTEM, flags, NULL, p, &changes, &n_changes);
if (r < 0) { if (r < 0) {
log_error_errno(r, "Failed to get file links for %s: %m", name); log_error_errno(r, "Failed to get file links for %s: %m", name);
goto finish; goto finish;