diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-08-22 18:48:03 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-08-24 19:48:26 +0200 |
| commit | 73d3ac8e2440cda3b7f2310f329f0798de6c041c (patch) | |
| tree | 2c0b703747602450361a5ded8916064f33a53364 /src/shared/bus-util.h | |
| parent | 2b07ec316a0e25a3e10c270c7f6baee9e0187bf8 (diff) | |
| download | systemd-73d3ac8e2440cda3b7f2310f329f0798de6c041c.tar.gz | |
various: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN
We return BUS_ERROR_NO_SUCH_UNIT a.k.a. org.freedesktop.systemd1.NoSuchUnit
in various places. In #16813:
Aug 22 06:14:48 core sudo[2769199]: pam_systemd_home(sudo:account): Failed to query user record: Unit dbus-org.freedesktop.home1.service not found.
Aug 22 06:14:48 core dbus-daemon[5311]: [system] Activation via systemd failed for unit 'dbus-org.freedesktop.home1.service': Unit dbus-org.freedesktop.home1.service not found.
Aug 22 06:14:48 core dbus-daemon[5311]: [system] Activating via systemd: service name='org.freedesktop.home1' unit='dbus-org.freedesktop.home1.service' requested by ':1.6564' (uid=0 pid=2769199 comm="sudo su ")
This particular error comes from bus_unit_validate_load_state() in pid1:
case UNIT_NOT_FOUND:
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_UNIT, "Unit %s not found.", u->id);
It seems possible that we should return a different error, but it doesn't really
matter: if we change pid1 to return a different error, we still need to handle
BUS_ERROR_NO_SUCH_UNIT as in this patch to handle pid1 with current code.
Diffstat (limited to 'src/shared/bus-util.h')
| -rw-r--r-- | src/shared/bus-util.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h index d98e0040f3..9b86f9526e 100644 --- a/src/shared/bus-util.h +++ b/src/shared/bus-util.h @@ -28,6 +28,7 @@ typedef bool (*check_idle_t)(void *userdata); int bus_event_loop_with_idle(sd_event *e, sd_bus *bus, const char *name, usec_t timeout, check_idle_t check_idle, void *userdata); int bus_name_has_owner(sd_bus *c, const char *name, sd_bus_error *error); +bool bus_error_is_unknown_service(const sd_bus_error *error); int bus_check_peercred(sd_bus *c); |