picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bus-util: return errors when encountered

Browse source 
Introduced in:
9f6eb1cd58
313333b403
This commit is contained in:
Thomas Hindoe Paaboel Andersen 2013-12-13 21:34:04 +01:00 committed by Lennart Poettering
parent 919ce0b7af
commit 2b49a47041
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libsystemd-bus/bus-util.c
View file

@ -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) if (r < 0)
r = sd_bus_message_read(reply, "bb", &authorized, &challenge); return r;
r = sd_bus_message_read(reply, "bb", &authorized, &challenge);
if (r < 0)
return r;
if (authorized) if (authorized)
return 1; return 1;
@ -997,6 +1001,8 @@ int bus_map_all_properties(sd_bus *bus,
r = prop->set(bus, member, m, &error, v); r = prop->set(bus, member, m, &error, v);
else else
r = map_basic(bus, member, m, &error, v); r = map_basic(bus, member, m, &error, v);
if (r < 0)
return r;
r = sd_bus_message_exit_container(m); r = sd_bus_message_exit_container(m);
if (r < 0) if (r < 0)