From 5644d47b7c288c4126aab60d2d6a65923f7df4cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 16 Apr 2020 13:46:37 +0200 Subject: [PATCH] logind: skip polkit query with --no-wall Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1800875. --- src/login/logind-dbus.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 15201f900f8..047f835327b 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -3170,6 +3170,12 @@ static int method_set_wall_message( if (r < 0) return r; + /* Short-circuit the operation if the desired state is already in place, to + * avoid an unnecessary polkit permission check. */ + if (streq_ptr(m->wall_message, empty_to_null(wall_message)) && + m->enable_wall_messages == enable_wall_messages) + goto done; + r = bus_verify_polkit_async(message, CAP_SYS_ADMIN, "org.freedesktop.login1.set-wall-message", @@ -3189,6 +3195,7 @@ static int method_set_wall_message( m->enable_wall_messages = enable_wall_messages; + done: return sd_bus_reply_method_return(message, NULL); } -- 2.47.3