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: add new sd_bus_creds object to encapsulate process credentials
[elogind.git]
/
src
/
login
/
logind-user-dbus.c
diff --git
a/src/login/logind-user-dbus.c
b/src/login/logind-user-dbus.c
index cf106c601349c6223101f50311e8a7a154108c3a..b034515203465e548c6da9d9c8b4a95cd75130b1 100644
(file)
--- a/
src/login/logind-user-dbus.c
+++ b/
src/login/logind-user-dbus.c
@@
-34,8
+34,8
@@
static int property_get_display(
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
) {
_cleanup_free_ char *p = NULL;
User *u = userdata;
_cleanup_free_ char *p = NULL;
User *u = userdata;
@@
-57,8
+57,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
) {
User *u = userdata;
User *u = userdata;
@@
-75,8
+75,8
@@
static int property_get_sessions(
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
) {
User *u = userdata;
Session *session;
User *u = userdata;
Session *session;
@@
-116,8
+116,8
@@
static int property_get_idle_hint(
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
) {
User *u = userdata;
User *u = userdata;
@@
-134,8
+134,8
@@
static int property_get_idle_since_hint(
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
) {
User *u = userdata;
dual_timestamp t;
User *u = userdata;
dual_timestamp t;
@@
-157,8
+157,8
@@
static int property_get_linger(
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
) {
User *u = userdata;
int r;
User *u = userdata;
int r;
@@
-172,7
+172,7
@@
static int property_get_linger(
return sd_bus_message_append(reply, "b", r > 0);
}
return sd_bus_message_append(reply, "b", r > 0);
}
-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
) {
User *u = userdata;
int r;
User *u = userdata;
int r;
@@
-182,12
+182,12
@@
static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata
r = user_stop(u);
if (r < 0)
r = user_stop(u);
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
) {
User *u = userdata;
int32_t signo;
int r;
User *u = userdata;
int32_t signo;
int r;
@@
-198,14
+198,14
@@
static int method_kill(sd_bus *bus, sd_bus_message *message, void *userdata) {
r = sd_bus_message_read(message, "i", &signo);
if (r < 0)
r = sd_bus_message_read(message, "i", &signo);
if (r < 0)
- return
sd_bus_reply_method_errno(message, r, NULL)
;
+ return
r
;
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 = user_kill(u, signo);
if (r < 0)
r = user_kill(u, 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);
}
@@
-235,7
+235,7
@@
const sd_bus_vtable user_vtable[] = {
SD_BUS_VTABLE_END
};
SD_BUS_VTABLE_END
};
-int user_object_find(sd_bus *bus, const char *path, const char *interface, void *
*found, void *userdata
) {
+int user_object_find(sd_bus *bus, const char *path, const char *interface, void *
userdata, void **found, sd_bus_error *error
) {
Manager *m = userdata;
User *user;
int r;
Manager *m = userdata;
User *user;
int r;
@@
-247,6
+247,7
@@
int user_object_find(sd_bus *bus, const char *path, const char *interface, void
assert(m);
if (streq(path, "/org/freedesktop/login1/user/self")) {
assert(m);
if (streq(path, "/org/freedesktop/login1/user/self")) {
+ _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
sd_bus_message *message;
pid_t pid;
sd_bus_message *message;
pid_t pid;
@@
-254,9
+255,13
@@
int user_object_find(sd_bus *bus, const char *path, const char *interface, void
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_user_by_pid(m, pid, &user);
if (r <= 0)
r = manager_get_user_by_pid(m, pid, &user);
if (r <= 0)
@@
-293,7
+298,7
@@
char *user_bus_path(User *u) {
return s;
}
return s;
}
-int user_node_enumerator(sd_bus *bus, const char *path,
char ***nodes, void *userdata
) {
+int user_node_enumerator(sd_bus *bus, const char *path,
void *userdata, char ***nodes, sd_bus_error *error
) {
_cleanup_strv_free_ char **l = NULL;
Manager *m = userdata;
User *user;
_cleanup_strv_free_ char **l = NULL;
Manager *m = userdata;
User *user;