logind: fix generation of bus arrays

diff --git a/src/logind-dbus.c b/src/logind-dbus.c
index 693906ef70e05cbd8d0a8b2b6ab7aa2c4b1451d3..2a85749478346a4f6c3514e8bbd46c683b042e05 100644 (file)
--- a/src/logind-dbus.c
+++ b/src/logind-dbus.c
@@ -589,7 +589,7 @@ static DBusHandlerResult manager_message_handler(
 
                 dbus_message_iter_init_append(reply, &iter);
 
-                if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "susso", &sub))
+                if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(susso)", &sub))
                         goto oom;
 
                 HASHMAP_FOREACH(session, m->sessions, i) {
@@ -635,7 +635,7 @@ static DBusHandlerResult manager_message_handler(
 
                 dbus_message_iter_init_append(reply, &iter);
 
-                if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "uso", &sub))
+                if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(uso)", &sub))
                         goto oom;
 
                 HASHMAP_FOREACH(user, m->users, i) {
@@ -679,7 +679,7 @@ static DBusHandlerResult manager_message_handler(
 
                 dbus_message_iter_init_append(reply, &iter);
 
-                if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "so", &sub))
+                if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(so)", &sub))
                         goto oom;
 
                 HASHMAP_FOREACH(seat, m->seats, i) {

diff --git a/src/logind-seat-dbus.c b/src/logind-seat-dbus.c
index ad0298e7a7f661efeac64ffdca5d160fdf4dc7c7..669e83e82d5e035ee32fbd2e805ec87387e92acb 100644 (file)
--- a/src/logind-seat-dbus.c
+++ b/src/logind-seat-dbus.c
@@ -102,7 +102,7 @@ static int bus_seat_append_sessions(DBusMessageIter *i, const char *property, vo
         assert(property);
         assert(s);
 
-        if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "so", &sub))
+        if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(so)", &sub))
                 return -ENOMEM;
 
         LIST_FOREACH(sessions_by_seat, session, s->sessions) {

diff --git a/src/logind-user-dbus.c b/src/logind-user-dbus.c
index 6d7e8e70309c95254947351e1a93b46e5532cb00..7263d1b757265ecc2504224a94524625b0a71a3f 100644 (file)
--- a/src/logind-user-dbus.c
+++ b/src/logind-user-dbus.c
@@ -121,7 +121,7 @@ static int bus_user_append_sessions(DBusMessageIter *i, const char *property, vo
         assert(property);
         assert(u);
 
-        if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "so", &sub))
+        if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(so)", &sub))
                 return -ENOMEM;
 
         LIST_FOREACH(sessions_by_user, session, u->sessions) {