polkit: simplify bus_verify_polkit_async() + drop auth-by-cap dbus feature

[thirdparty/systemd.git] / src / core / dbus-service.c

diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index 5bc487bc39925068f315caac6cd3ca089be11b6c..77cf6f003d7ada1d92a53f8f4a319d5a5c4a7ce8 100644 (file)
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -166,9 +166,7 @@ static int bus_service_method_mount(sd_bus_message *message, void *userdata, sd_
         r = bus_verify_manage_units_async_full(
                         u,
                         is_image ? "mount-image" : "bind-mount",
-                        CAP_SYS_ADMIN,
                         N_("Authentication is required to mount on '$(unit)'."),
-                        true,
                         message,
                         error);
         if (r < 0)
@@ -198,7 +196,7 @@ static int bus_service_method_mount(sd_bus_message *message, void *userdata, sd_
         propagate_directory = strjoina("/run/systemd/propagate/", u->id);
         if (is_image)
                 r = mount_image_in_namespace(
-                                unit_pid->pid,
+                                unit_pid,
                                 propagate_directory,
                                 "/run/systemd/incoming/",
                                 src, dest,
@@ -208,7 +206,7 @@ static int bus_service_method_mount(sd_bus_message *message, void *userdata, sd_
                                 c->mount_image_policy ?: &image_policy_service);
         else
                 r = bind_mount_in_namespace(
-                                unit_pid->pid,
+                                unit_pid,
                                 propagate_directory,
                                 "/run/systemd/incoming/",
                                 src, dest,