summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-08-27 19:00:34 +0200
committerLukas Nykryn <lnykryn@redhat.com>2019-10-24 12:21:56 +0200
commitc3be943b30689f77ded9f431fdafb666769aea89 (patch)
treedb98575758b6fa169a02f84edd651603b0091784
parent080d3b14470f6ac59f4cfb97a4200ed18df5c260 (diff)
downloadsystemd-c3be943b30689f77ded9f431fdafb666769aea89.tar.gz
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. Resolves: #1746857
-rw-r--r--src/shared/bus-util.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index a4f2deba31..302dbb4c2e 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1699,10 +1699,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;