From c3be943b30689f77ded9f431fdafb666769aea89 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Tue, 27 Aug 2019 19:00:34 +0200

Subject: [PATCH] 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

---

 src/shared/bus-util.c | 4 ----

 1 file changed, 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;