From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 16 Aug 2024 10:59:30 +0000 (+0900)
Subject: run: use sd_bus_set_allow_interactive_authorization()
X-Git-Tag: v257-rc1~676^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b8a74678c7259ad370c4871221272eb11147253;p=thirdparty%2Fsystemd.git

run: use sd_bus_set_allow_interactive_authorization()
---

diff --git a/src/run/run.c b/src/run/run.c
index 30fccfb47ea..f2f94c5dfda 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -1562,10 +1562,6 @@ static int make_transient_service_unit(
         if (r < 0)
                 return bus_log_create_error(r);
 
-        r = sd_bus_message_set_allow_interactive_authorization(m, arg_ask_password);
-        if (r < 0)
-                return bus_log_create_error(r);
-
         /* Name and mode */
         r = sd_bus_message_append(m, "ss", service, "fail");
         if (r < 0)
@@ -2047,10 +2043,6 @@ static int start_transient_scope(sd_bus *bus) {
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_set_allow_interactive_authorization(m, arg_ask_password);
-                if (r < 0)
-                        return bus_log_create_error(r);
-
                 /* Name and Mode */
                 r = sd_bus_message_append(m, "ss", scope, "fail");
                 if (r < 0)
@@ -2219,10 +2211,6 @@ static int make_transient_trigger_unit(
         if (r < 0)
                 return bus_log_create_error(r);
 
-        r = sd_bus_message_set_allow_interactive_authorization(m, arg_ask_password);
-        if (r < 0)
-                return bus_log_create_error(r);
-
         /* Name and Mode */
         r = sd_bus_message_append(m, "ss", trigger, "fail");
         if (r < 0)
@@ -2453,6 +2441,8 @@ static int run(int argc, char* argv[]) {
         if (r < 0)
                 return bus_log_connect_error(r, arg_transport);
 
+        (void) sd_bus_set_allow_interactive_authorization(bus, arg_ask_password);
+
         if (arg_scope)
                 return start_transient_scope(bus);
         if (arg_path_property)