From: Zbigniew Jędrzejewski-Szmek Date: Tue, 27 Aug 2019 17:00:34 +0000 (+0200) Subject: shared/but-util: drop trusted annotation from bus_open_system_watch_bind_with_descrip... X-Git-Tag: v243~2^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35e528018f315798d3bffcb592b32a0d8f5162bd;p=platform%2Fupstream%2Fsystemd.git shared/but-util: drop trusted annotation from bus_open_system_watch_bind_with_description() https://bugzilla.redhat.com/show_bug.cgi?id=1746057 This only affects systemd-resolved. bus_open_system_watch_bind_with_description() is also used in timesyncd, but it has no methods, only read-only properties, and in networkd, but it annotates all methods with SD_BUS_VTABLE_UNPRIVILEGED and does polkit checks. --- diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 6af115e..821339d 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -1705,10 +1705,6 @@ int bus_open_system_watch_bind_with_description(sd_bus **ret, const char *descri if (r < 0) return r; - r = sd_bus_set_trusted(bus, true); - if (r < 0) - return r; - r = sd_bus_negotiate_creds(bus, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_EUID|SD_BUS_CREDS_EFFECTIVE_CAPS); if (r < 0) return r;