]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mount: use sd_bus_set_allow_interactive_authorization()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 16 Aug 2024 10:58:45 +0000 (19:58 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 19 Aug 2024 02:36:32 +0000 (11:36 +0900)
src/mount/mount-tool.c

index fb9e3b3a1415f777ebd79b6cae0193f4813cda72..278890dd6958a62761d7fb5385b9522c25c05a6a 100644 (file)
@@ -638,10 +638,6 @@ static int start_transient_mount(
         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", mount_unit, "fail");
         if (r < 0)
@@ -719,10 +715,6 @@ static int start_transient_automount(
         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", automount_unit, "fail");
         if (r < 0)
@@ -923,10 +915,6 @@ static int stop_mount(
         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", mount_unit, "fail");
         if (r < 0)
@@ -1527,6 +1515,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_action == ACTION_UMOUNT)
                 return action_umount(bus, argc, argv);