From 55d5b3b81648d8e0470b01b48d7a568f6792014f Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Thu, 29 Jun 2017 10:06:25 +0200 Subject: [PATCH] Prep v231.3: Only ask for reboot authorization when shutting down or rebooting. It is not needed to ask for authorization to put the system to sleep. Such a system is most commonly a single-user laptop, and no user, especially me, wants to enter the root password after hitting the suspend key. ;-) --- src/login/elogind-dbus.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/login/elogind-dbus.c b/src/login/elogind-dbus.c index cf7f3dcb6..a35ca1708 100644 --- a/src/login/elogind-dbus.c +++ b/src/login/elogind-dbus.c @@ -404,11 +404,13 @@ static int method_do_shutdown_or_sleep( return sd_bus_error_setf(error, BUS_ERROR_SLEEP_VERB_NOT_SUPPORTED, "Sleep verb not supported"); } - r = verify_shutdown_creds(m, message, w, interactive, action, action_multiple_sessions, - action_ignore_inhibit, error); - log_debug_elogind("verify_shutdown_creds() returned %d", r); - if (r != 0) - return r; + if (IN_SET(sleep_action, HANDLE_HALT, HANDLE_POWEROFF, HANDLE_REBOOT)) { + r = verify_shutdown_creds(m, message, w, interactive, action, action_multiple_sessions, + action_ignore_inhibit, error); + log_debug_elogind("verify_shutdown_creds() returned %d", r); + if (r != 0) + return r; + } r = bus_manager_shutdown_or_sleep_now_or_later(m, sleep_action, w, error); if (r < 0) -- 2.30.2