chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: priorize notification fd processing over notification fd process via sd-event...
[elogind.git]
/
src
/
machine
/
machine-dbus.c
diff --git
a/src/machine/machine-dbus.c
b/src/machine/machine-dbus.c
index 8e671edba3e37b6dc9dd6dbd5c7b64ba6024615b..1f24b11197c022036e19383d97682bc4e8c45335 100644
(file)
--- a/
src/machine/machine-dbus.c
+++ b/
src/machine/machine-dbus.c
@@
-32,8
+32,8
@@
static int property_get_id(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Machine *m = userdata;
int r;
Machine *m = userdata;
int r;
@@
-55,8
+55,8
@@
static int property_get_state(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Machine *m = userdata;
const char *state;
Machine *m = userdata;
const char *state;
@@
-77,7
+77,7
@@
static int property_get_state(
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_class, machine_class, MachineClass);
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_class, machine_class, MachineClass);
-static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata) {
+static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata
, sd_bus_error *error
) {
Machine *m = userdata;
int r;
Machine *m = userdata;
int r;
@@
-87,12
+87,12
@@
static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata
r = machine_stop(m);
if (r < 0)
r = machine_stop(m);
if (r < 0)
- return
sd_bus_reply_method_errno(message, r, NULL)
;
+ return
r
;
return sd_bus_reply_method_return(message, NULL);
}
return sd_bus_reply_method_return(message, NULL);
}
-static int method_kill(sd_bus *bus, sd_bus_message *message, void *userdata) {
+static int method_kill(sd_bus *bus, sd_bus_message *message, void *userdata
, sd_bus_error *error
) {
Machine *m = userdata;
const char *swho;
int32_t signo;
Machine *m = userdata;
const char *swho;
int32_t signo;
@@
-105,22
+105,22
@@
static int method_kill(sd_bus *bus, sd_bus_message *message, void *userdata) {
r = sd_bus_message_read(message, "si", &swho, &signo);
if (r < 0)
r = sd_bus_message_read(message, "si", &swho, &signo);
if (r < 0)
- return
sd_bus_reply_method_errno(message, r, NULL)
;
+ return
r
;
if (isempty(swho))
who = KILL_ALL;
else {
who = kill_who_from_string(swho);
if (who < 0)
if (isempty(swho))
who = KILL_ALL;
else {
who = kill_who_from_string(swho);
if (who < 0)
- return sd_bus_
reply_method_errorf(message
, SD_BUS_ERROR_INVALID_ARGS, "Invalid kill parameter '%s'", swho);
+ return sd_bus_
error_setf(error
, SD_BUS_ERROR_INVALID_ARGS, "Invalid kill parameter '%s'", swho);
}
if (signo <= 0 || signo >= _NSIG)
}
if (signo <= 0 || signo >= _NSIG)
- return sd_bus_
reply_method_errorf(message
, SD_BUS_ERROR_INVALID_ARGS, "Invalid signal %i", signo);
+ return sd_bus_
error_setf(error
, SD_BUS_ERROR_INVALID_ARGS, "Invalid signal %i", signo);
r = machine_kill(m, who, signo);
if (r < 0)
r = machine_kill(m, who, signo);
if (r < 0)
- return
sd_bus_reply_method_errno(message, r, NULL)
;
+ return
r
;
return sd_bus_reply_method_return(message, NULL);
}
return sd_bus_reply_method_return(message, NULL);
}
@@
-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;