X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbus-proxyd%2Fdriver.c;h=3c613e415795b270ab1e19108819c53fe04bbaa3;hb=c29005212dc38d98c707639d1a82ffa5270f2e97;hp=e47c667141d7c456a1616b28f0a259c727af527a;hpb=df3efc3c9008eec6f2d3dc8df997f06758911fc8;p=elogind.git diff --git a/src/bus-proxyd/driver.c b/src/bus-proxyd/driver.c index e47c66714..3c613e415 100644 --- a/src/bus-proxyd/driver.c +++ b/src/bus-proxyd/driver.c @@ -21,23 +21,16 @@ along with systemd; If not, see . ***/ -#include -#include #include #include #include -#include "log.h" #include "util.h" #include "sd-bus.h" #include "bus-internal.h" #include "bus-message.h" #include "bus-util.h" -#include "build.h" #include "strv.h" -#include "def.h" -#include "capability.h" -#include "bus-control.h" #include "set.h" #include "driver.h" #include "synthesize.h" @@ -305,7 +298,7 @@ int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPoli /* Let's sort the names list to make it stable */ strv_sort(names); - return synthetic_reply_return_strv(m, names); + return synthetic_reply_method_return_strv(m, names); } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "ListNames")) { _cleanup_strv_free_ char **names = NULL; @@ -324,7 +317,7 @@ int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPoli /* Let's sort the names list to make it stable */ strv_sort(names); - return synthetic_reply_return_strv(m, names); + return synthetic_reply_method_return_strv(m, names); } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "ListQueuedOwners")) { struct kdbus_cmd_list cmd = { @@ -389,7 +382,7 @@ int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPoli if (err < 0) return synthetic_reply_method_errno(m, err, NULL); - return synthetic_reply_return_strv(m, owners); + return synthetic_reply_method_return_strv(m, owners); } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "NameHasOwner")) { const char *name;