mirror of
https://github.com/systemd/systemd.git
synced 2024-11-06 16:59:03 +03:00
logind: fix generation of bus arrays
This commit is contained in:
parent
19bc719ec2
commit
dec15e9263
@ -589,7 +589,7 @@ static DBusHandlerResult manager_message_handler(
|
|||||||
|
|
||||||
dbus_message_iter_init_append(reply, &iter);
|
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;
|
goto oom;
|
||||||
|
|
||||||
HASHMAP_FOREACH(session, m->sessions, i) {
|
HASHMAP_FOREACH(session, m->sessions, i) {
|
||||||
@ -635,7 +635,7 @@ static DBusHandlerResult manager_message_handler(
|
|||||||
|
|
||||||
dbus_message_iter_init_append(reply, &iter);
|
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;
|
goto oom;
|
||||||
|
|
||||||
HASHMAP_FOREACH(user, m->users, i) {
|
HASHMAP_FOREACH(user, m->users, i) {
|
||||||
@ -679,7 +679,7 @@ static DBusHandlerResult manager_message_handler(
|
|||||||
|
|
||||||
dbus_message_iter_init_append(reply, &iter);
|
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;
|
goto oom;
|
||||||
|
|
||||||
HASHMAP_FOREACH(seat, m->seats, i) {
|
HASHMAP_FOREACH(seat, m->seats, i) {
|
||||||
|
@ -102,7 +102,7 @@ static int bus_seat_append_sessions(DBusMessageIter *i, const char *property, vo
|
|||||||
assert(property);
|
assert(property);
|
||||||
assert(s);
|
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;
|
return -ENOMEM;
|
||||||
|
|
||||||
LIST_FOREACH(sessions_by_seat, session, s->sessions) {
|
LIST_FOREACH(sessions_by_seat, session, s->sessions) {
|
||||||
|
@ -121,7 +121,7 @@ static int bus_user_append_sessions(DBusMessageIter *i, const char *property, vo
|
|||||||
assert(property);
|
assert(property);
|
||||||
assert(u);
|
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;
|
return -ENOMEM;
|
||||||
|
|
||||||
LIST_FOREACH(sessions_by_user, session, u->sessions) {
|
LIST_FOREACH(sessions_by_user, session, u->sessions) {
|
||||||
|
Loading…
Reference in New Issue
Block a user