system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 10:17:21 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #28736 from poettering/polkit-tweaks

Browse source 
some minor polkit handling tweaks
This commit is contained in:
Lennart Poettering 2023-08-10 09:35:52 +02:00 committed by GitHub
parent 7e1850e54b c1b2e1a89a
commit a74c99807f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/shared/bus-polkit.c
View file

@ -220,10 +220,8 @@ static AsyncPolkitQuery *async_polkit_query_free(AsyncPolkitQuery *q) {
sd_event_source_disable_unref(q->defer_event_source);
while ((a = q->authorized_actions)) {
LIST_REMOVE(authorized, q->authorized_actions, a);
while ((a = LIST_POP(authorized, q->authorized_actions)))
async_polkit_query_action_free(a);
}
async_polkit_query_action_free(q->denied_action);
async_polkit_query_action_free(q->error_action);
@ -255,6 +253,11 @@ static int async_polkit_read_reply(sd_bus_message *reply, AsyncPolkitQuery *q) {
assert(reply);
assert(q);
/* Processing of a PolicyKit checks is canceled on the first auth. error. */
assert(!q->denied_action);
assert(!q->error_action);
assert(!sd_bus_error_is_set(&q->error));
assert(q->action);
a = TAKE_PTR(q->action);
@ -272,7 +275,6 @@ static int async_polkit_read_reply(sd_bus_message *reply, AsyncPolkitQuery *q) {
/* Treat no PK available as access denied */
q->denied_action = TAKE_PTR(a);
return 0;
}
@ -282,12 +284,6 @@ static int async_polkit_read_reply(sd_bus_message *reply, AsyncPolkitQuery *q) {
if (r < 0)
return r;
/* It's currently expected that processing of a DBus message shall be interrupted on the first
* auth. error */
assert(!q->denied_action);
assert(!q->error_action);
assert(!sd_bus_error_is_set(&q->error));
if (authorized)
LIST_PREPEND(authorized, q->authorized_actions, TAKE_PTR(a));
else if (challenge) {