chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
loopback-setup: correctly set flags and scope for ipv6 address
[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 30ee67e85050ab63d96f31653b9b6272e6db6fbc..4c87e167264d12c8c3b4ca709e365b2b1b3dec6a 100644
(file)
--- a/
src/libsystemd-bus/bus-util.c
+++ b/
src/libsystemd-bus/bus-util.c
@@
-212,8
+212,12
@@
int bus_verify_polkit(
}
r = sd_bus_message_enter_container(reply, 'r', "bba{ss}");
}
r = sd_bus_message_enter_container(reply, 'r', "bba{ss}");
- if (r >= 0)
- r = sd_bus_message_read(reply, "bb", &authorized, &challenge);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_read(reply, "bb", &authorized, &challenge);
+ if (r < 0)
+ return r;
if (authorized)
return 1;
if (authorized)
return 1;
@@
-328,7
+332,7
@@
int bus_verify_polkit_async(
if (sd_bus_error_has_name(e, SD_BUS_ERROR_SERVICE_UNKNOWN))
return -EACCES;
if (sd_bus_error_has_name(e, SD_BUS_ERROR_SERVICE_UNKNOWN))
return -EACCES;
- return sd_bus_error_get_errno(e);
+ return
-
sd_bus_error_get_errno(e);
}
r = sd_bus_message_enter_container(q->reply, 'r', "bba{ss}");
}
r = sd_bus_message_enter_container(q->reply, 'r', "bba{ss}");
@@
-997,6
+1001,8
@@
int bus_map_all_properties(sd_bus *bus,
r = prop->set(bus, member, m, &error, v);
else
r = map_basic(bus, member, m, &error, v);
r = prop->set(bus, member, m, &error, v);
else
r = map_basic(bus, member, m, &error, v);
+ if (r < 0)
+ return r;
r = sd_bus_message_exit_container(m);
if (r < 0)
r = sd_bus_message_exit_container(m);
if (r < 0)