chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: indicate in .pc file that we need libsystemd-id128 definitions
[elogind.git]
/
src
/
libsystemd-bus
/
bus-util.c
diff --git
a/src/libsystemd-bus/bus-util.c
b/src/libsystemd-bus/bus-util.c
index eec70ed15270c56e246e01597caa56695e4e09d9..13ad4442ba261f5f0342f0d9a6e818cc90600fe4 100644
(file)
--- a/
src/libsystemd-bus/bus-util.c
+++ b/
src/libsystemd-bus/bus-util.c
@@
-151,7
+151,7
@@
int bus_verify_polkit(
#ifdef ENABLE_POLKIT
else {
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
#ifdef ENABLE_POLKIT
else {
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
-
unsigned
authorized = false, challenge = false;
+
int
authorized = false, challenge = false;
r = sd_bus_call_method(
bus,
r = sd_bus_call_method(
bus,
@@
-178,9
+178,9
@@
int bus_verify_polkit(
return r;
}
return r;
}
- r = sd_bus_message_
read(reply, "(bb)", &authorized, &challenge
);
- if (r
<
0)
- r
eturn r
;
+ r = sd_bus_message_
enter_container(reply, 'r', "bba{ss}"
);
+ if (r
>=
0)
+ r
= sd_bus_message_read(reply, "bb", &authorized, &challenge)
;
if (authorized)
return 1;
if (authorized)
return 1;
@@
-270,7
+270,7
@@
int bus_verify_polkit_async(
#ifdef ENABLE_POLKIT
q = hashmap_remove(*registry, m);
if (q) {
#ifdef ENABLE_POLKIT
q = hashmap_remove(*registry, m);
if (q) {
-
unsigned
authorized, challenge;
+
int
authorized, challenge;
/* This is the second invocation of this function, and
* there's already a response from polkit, let's
/* This is the second invocation of this function, and
* there's already a response from polkit, let's