From: Luca Boccassi <bluca@debian.org>
Date: Mon, 11 Mar 2024 12:15:52 +0000 (+0000)
Subject: polkit: update the rest of bus_verify_polkit_async_full() calls to new flags parameter
X-Git-Tag: v256-rc1~575
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14300cdde437bdc8aa0fe309f84c9c532ef016e6;p=thirdparty%2Fsystemd.git

polkit: update the rest of bus_verify_polkit_async_full() calls to new flags parameter

Looks like the compiler doesn't even notice these were left over
as the types end up matching somehow

Follow-up for 29556b75d8025580eebe160a1fa1459965912ee2
---

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 0e4e93d2775..27d4f72b4c0 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1644,8 +1644,8 @@ static int method_flush_devices(sd_bus_message *message, void *userdata, sd_bus_
                         message,
                         "org.freedesktop.login1.flush-devices",
                         /* details= */ NULL,
-                        interactive,
                         /* good_user= */ UID_INVALID,
+                        interactive ? POLKIT_ALLOW_INTERACTIVE : 0,
                         &m->polkit_registry,
                         error);
         if (r < 0)
@@ -2001,8 +2001,8 @@ static int verify_shutdown_creds(
                                 message,
                                 a->polkit_action_multiple_sessions,
                                 /* details= */ NULL,
-                                interactive,
                                 /* good_user= */ UID_INVALID,
+                                interactive ? POLKIT_ALLOW_INTERACTIVE : 0,
                                 &m->polkit_registry,
                                 error);
                 if (r < 0)
@@ -2021,8 +2021,8 @@ static int verify_shutdown_creds(
                                 message,
                                 a->polkit_action_ignore_inhibit,
                                 /* details= */ NULL,
-                                interactive,
                                 /* good_user= */ UID_INVALID,
+                                interactive ? POLKIT_ALLOW_INTERACTIVE : 0,
                                 &m->polkit_registry,
                                 error);
                 if (r < 0)
@@ -2036,8 +2036,8 @@ static int verify_shutdown_creds(
                                 message,
                                 a->polkit_action,
                                 /* details= */ NULL,
-                                interactive,
                                 /* good_user= */ UID_INVALID,
+                                interactive ? POLKIT_ALLOW_INTERACTIVE : 0,
                                 &m->polkit_registry,
                                 error);
                 if (r < 0)
diff --git a/src/resolve/resolved-dnssd-bus.c b/src/resolve/resolved-dnssd-bus.c
index 0ae24fbf028..b2deef5694e 100644
--- a/src/resolve/resolved-dnssd-bus.c
+++ b/src/resolve/resolved-dnssd-bus.c
@@ -24,8 +24,8 @@ int bus_dnssd_method_unregister(sd_bus_message *message, void *userdata, sd_bus_
                         message,
                         "org.freedesktop.resolve1.unregister-service",
                         /* details= */ NULL,
-                        /* interactive= */ false,
                         /* good_user= */ s->originator,
+                        /* flags= */ 0,
                         &m->polkit_registry,
                         error);
         if (r < 0)
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index a7dcb832065..32e7bbd5b4d 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -670,8 +670,8 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
                         m,
                         "org.freedesktop.timedate1.set-timezone",
                         /* details= */ NULL,
-                        interactive,
                         /* good_user= */ UID_INVALID,
+                        interactive ? POLKIT_ALLOW_INTERACTIVE : 0,
                         &c->polkit_registry,
                         error);
         if (r < 0)
@@ -744,8 +744,8 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
                         m,
                         "org.freedesktop.timedate1.set-local-rtc",
                         /* details= */ NULL,
-                        interactive,
                         /* good_user= */ UID_INVALID,
+                        interactive ? POLKIT_ALLOW_INTERACTIVE : 0,
                         &c->polkit_registry,
                         error);
         if (r < 0)
@@ -863,8 +863,8 @@ static int method_set_time(sd_bus_message *m, void *userdata, sd_bus_error *erro
                         m,
                         "org.freedesktop.timedate1.set-time",
                         /* details= */ NULL,
-                        interactive,
                         /* good_user= */ UID_INVALID,
+                        interactive ? POLKIT_ALLOW_INTERACTIVE : 0,
                         &c->polkit_registry,
                         error);
         if (r < 0)
@@ -926,8 +926,8 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
                         m,
                         "org.freedesktop.timedate1.set-ntp",
                         /* details= */ NULL,
-                        interactive,
                         /* good_user= */ UID_INVALID,
+                        interactive ? POLKIT_ALLOW_INTERACTIVE : 0,
                         &c->polkit_registry,
                         error);
         if (r < 0)