ryantimwilson / rpms / systemd

Forked from rpms/systemd a month ago
Clone
4fbe94
From c3be943b30689f77ded9f431fdafb666769aea89 Mon Sep 17 00:00:00 2001
4fbe94
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
4fbe94
Date: Tue, 27 Aug 2019 19:00:34 +0200
4fbe94
Subject: [PATCH] shared/but-util: drop trusted annotation from
4fbe94
 bus_open_system_watch_bind_with_description()
4fbe94
4fbe94
https://bugzilla.redhat.com/show_bug.cgi?id=1746057
4fbe94
4fbe94
This only affects systemd-resolved. bus_open_system_watch_bind_with_description()
4fbe94
is also used in timesyncd, but it has no methods, only read-only properties, and
4fbe94
in networkd, but it annotates all methods with SD_BUS_VTABLE_UNPRIVILEGED and does
4fbe94
polkit checks.
4fbe94
4fbe94
Resolves: #1746857
4fbe94
---
4fbe94
 src/shared/bus-util.c | 4 ----
4fbe94
 1 file changed, 4 deletions(-)
4fbe94
4fbe94
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
4fbe94
index a4f2deba31..302dbb4c2e 100644
4fbe94
--- a/src/shared/bus-util.c
4fbe94
+++ b/src/shared/bus-util.c
4fbe94
@@ -1699,10 +1699,6 @@ int bus_open_system_watch_bind_with_description(sd_bus **ret, const char *descri
4fbe94
         if (r < 0)
4fbe94
                 return r;
4fbe94
 
4fbe94
-        r = sd_bus_set_trusted(bus, true);
4fbe94
-        if (r < 0)
4fbe94
-                return r;
4fbe94
-
4fbe94
         r = sd_bus_negotiate_creds(bus, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_EUID|SD_BUS_CREDS_EFFECTIVE_CAPS);
4fbe94
         if (r < 0)
4fbe94
                 return r;