chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: fix typo in systemd-bus-proxyd
[elogind.git]
/
src
/
machine
/
machine-dbus.c
diff --git
a/src/machine/machine-dbus.c
b/src/machine/machine-dbus.c
index 2c7f3a798e239f07900a042ff3b4450915119b4d..1f24b11197c022036e19383d97682bc4e8c45335 100644
(file)
--- a/
src/machine/machine-dbus.c
+++ b/
src/machine/machine-dbus.c
@@
-142,7
+142,7
@@
const sd_bus_vtable machine_vtable[] = {
SD_BUS_VTABLE_END
};
SD_BUS_VTABLE_END
};
-int machine_object_find(sd_bus *bus, const char *path, const char *interface, void *
*found, void *userdata
) {
+int machine_object_find(sd_bus *bus, const char *path, const char *interface, void *
userdata, void **found, sd_bus_error *error
) {
Manager *m = userdata;
Machine *machine;
int r;
Manager *m = userdata;
Machine *machine;
int r;
@@
-154,6
+154,7
@@
int machine_object_find(sd_bus *bus, const char *path, const char *interface, vo
assert(m);
if (streq(path, "/org/freedesktop/machine1/machine/self")) {
assert(m);
if (streq(path, "/org/freedesktop/machine1/machine/self")) {
+ _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
sd_bus_message *message;
pid_t pid;
sd_bus_message *message;
pid_t pid;
@@
-161,9
+162,13
@@
int machine_object_find(sd_bus *bus, const char *path, const char *interface, vo
if (!message)
return 0;
if (!message)
return 0;
- r = sd_bus_
get_owner_pid(bus, sd_bus_message_get_sender(message), &pid
);
+ r = sd_bus_
query_sender_creds(message, SD_BUS_CREDS_PID, &creds
);
if (r < 0)
if (r < 0)
- return 0;
+ return r;
+
+ r = sd_bus_creds_get_pid(creds, &pid);
+ if (r < 0)
+ return r;
r = manager_get_machine_by_pid(m, pid, &machine);
if (r <= 0)
r = manager_get_machine_by_pid(m, pid, &machine);
if (r <= 0)
@@
-201,7
+206,7
@@
char *machine_bus_path(Machine *m) {
return strappend("/org/freedesktop/machine1/machine/", e);
}
return strappend("/org/freedesktop/machine1/machine/", e);
}
-int machine_node_enumerator(sd_bus *bus, const char *path,
char ***nodes, void *userdata
) {
+int machine_node_enumerator(sd_bus *bus, const char *path,
void *userdata, char ***nodes, sd_bus_error *error
) {
_cleanup_strv_free_ char **l = NULL;
Machine *machine = NULL;
Manager *m = userdata;
_cleanup_strv_free_ char **l = NULL;
Machine *machine = NULL;
Manager *m = userdata;