[systemd-commits] 3 commits - src/libsystemd-bus src/login

[Lennart Poettering]

 src/libsystemd-bus/bus-util.c |    6 +++---
 src/login/logind-dbus.c       |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit dd9f052591e482c57c57a92e2c7cc4b0470fe275
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Nov 5 17:59:55 2013 +0100

    logind: fix serialization for PrepareForSleep boolean

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 532b48f..dcfd25d 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1369,7 +1369,7 @@ static int send_prepare_for(Manager *m, InhibitWhat w, bool _active) {
                                   "org.freedesktop.login1.Manager",
                                   signal_name[w],
                                   "b",
-                                  &active);
+                                  active);
 }
 
 int bus_manager_shutdown_or_sleep_now_or_later(

commit dbfa3fbbe423bfaa6b5e864cce51724f8ddfb64f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Nov 5 17:47:15 2013 +0100

    logind: fix serialization of ListInhibitors() request

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 9fe41d8..532b48f 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -400,7 +400,7 @@ static int method_list_inhibitors(sd_bus *bus, sd_bus_message *message, void *us
 
         HASHMAP_FOREACH(inhibitor, m->inhibitors, i) {
 
-                r = sd_bus_message_append(reply, "ssssuu",
+                r = sd_bus_message_append(reply, "(ssssuu)",
                                           strempty(inhibit_what_to_string(inhibitor->what)),
                                           strempty(inhibitor->who),
                                           strempty(inhibitor->why),

commit 313333b403439360c0396a50d77d0a1ee2bca4df
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Nov 5 17:45:46 2013 +0100

    bus: fix deserialization of polkit response

diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c
index eec70ed..3bb1fb7 100644
--- a/src/libsystemd-bus/bus-util.c
+++ b/src/libsystemd-bus/bus-util.c
@@ -178,9 +178,9 @@ int bus_verify_polkit(
                         return r;
                 }
 
-                r = sd_bus_message_read(reply, "(bb)", &authorized, &challenge);
-                if (r < 0)
-                        return 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;