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

logind: automatically determine client side PID if GetSessionByPID() is called with a PID == 0

This commit is contained in:
Lennart Poettering 2013-11-05 20:44:27 +01:00
parent 2614202b51
commit 4e724d9c5a
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/login/logind-dbus.c
View File

@ -157,17 +157,25 @@ static int method_get_session_by_pid(sd_bus *bus, sd_bus_message *message, void
_cleanup_free_ char *p = NULL;
Session *session = NULL;
Manager *m = userdata;
uint32_t pid;
pid_t pid;
int r;
assert(bus);
assert(message);
assert(m);
assert_cc(sizeof(pid_t) == sizeof(uint32_t));
r = sd_bus_message_read(message, "u", &pid);
if (r < 0)
return sd_bus_reply_method_errno(bus, message, r, NULL);
if (pid == 0) {
r = sd_bus_get_owner_pid(bus, sd_bus_message_get_sender(message), &pid);
if (r < 0)
return sd_bus_reply_method_errno(bus, message, r, NULL);
}
r = manager_get_session_by_pid(m, pid, &session);
if (r < 0)
return sd_bus_reply_method_errno(bus, message, r, NULL);
@ -211,17 +219,25 @@ static int method_get_user_by_pid(sd_bus *bus, sd_bus_message *message, void *us
_cleanup_free_ char *p = NULL;
Manager *m = userdata;
User *user = NULL;
uint32_t pid;
pid_t pid;
int r;
assert(bus);
assert(message);
assert(m);
assert_cc(sizeof(pid_t) == sizeof(uint32_t));
r = sd_bus_message_read(message, "u", &pid);
if (r < 0)
return sd_bus_reply_method_errno(bus, message, r, NULL);
if (pid == 0) {
r = sd_bus_get_owner_pid(bus, sd_bus_message_get_sender(message), &pid);
if (r < 0)
return sd_bus_reply_method_errno(bus, message, r, NULL);
}
r = manager_get_user_by_pid(m, pid, &user);
if (r < 0)
return sd_bus_reply_method_errno(bus, message, r, NULL);

10
src/machine/machined-dbus.c
View File

@ -86,17 +86,25 @@ static int method_get_machine_by_pid(sd_bus *bus, sd_bus_message *message, void
_cleanup_free_ char *p = NULL;
Manager *m = userdata;
Machine *machine = NULL;
uint32_t pid;
pid_t pid;
int r;
assert(bus);
assert(message);
assert(m);
assert_cc(sizeof(pid_t) == sizeof(uint32_t));
r = sd_bus_message_read(message, "u", &pid);
if (r < 0)
return sd_bus_reply_method_errno(bus, message, r, NULL);
if (pid == 0) {
r = sd_bus_get_owner_pid(bus, sd_bus_message_get_sender(message), &pid);
if (r < 0)
return sd_bus_reply_method_errno(bus, message, r, NULL);
}
r = manager_get_machine_by_pid(m, pid, &machine);
if (r < 0)
return sd_bus_reply_method_errno(bus, message, r, NULL);