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

dbus: implement GetAll() with empty interface string properly

Browse source
This commit is contained in:
Lennart Poettering 2010-07-04 03:43:20 +02:00
parent 0442c13bfa
commit 09c661966c
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/dbus.c
View file

@ -1201,7 +1201,6 @@ DBusHandlerResult bus_default_message_handler(Manager *m, DBusConnection *c, DBu
const char *interface;
const BusProperty *p;
DBusMessageIter iter, sub, sub2, sub3;
bool any = false;
if (!dbus_message_get_args(
message,
@ -1219,7 +1218,7 @@ DBusHandlerResult bus_default_message_handler(Manager *m, DBusConnection *c, DBu
goto oom;
for (p = properties; p->property; p++) {
if (!streq(p->interface, interface))
if (interface[0] && !streq(p->interface, interface))
continue;
if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, NULL, &sub2) ||
@ -1239,8 +1238,6 @@ DBusHandlerResult bus_default_message_handler(Manager *m, DBusConnection *c, DBu
if (!dbus_message_iter_close_container(&sub2, &sub3) ||
!dbus_message_iter_close_container(&sub, &sub2))
goto oom;
any = true;
}
if (!dbus_message_iter_close_container(&iter, &sub))