shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-05 13:18:06 +03:00
Code

logind-dbus: modernize method_set_user_linger

Browse Source 
Currently, user_start() doesn't return any error,
but let's not eat up the return value.
Preparation for #30910, after which user_start()
does return error.
This commit is contained in:
Mike Yuan 2024-01-18 15:28:39 +08:00
parent 210d4cde71
commit ade9553d91
No known key found for this signature in database
GPG Key ID: 417471C0A40F58B3
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1418,28 +1418,25 @@ static int method_terminate_seat(sd_bus_message *message, void *userdata, sd_bus
}
static int method_set_user_linger(sd_bus_message *message, void *userdata, sd_bus_error *error) {
_cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;
_cleanup_free_ struct passwd *pw = NULL;
_cleanup_free_ char *cc = NULL;
Manager *m = ASSERT_PTR(userdata);
int r, b, interactive;
const char *path;
_cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;
uint32_t uid, auth_uid;
int r, enable, interactive;
assert(message);
r = sd_bus_message_read(message, "ubb", &uid, &b, &interactive);
r = sd_bus_message_read(message, "ubb", &uid, &enable, &interactive);
if (r < 0)
return r;
r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_EUID |
SD_BUS_CREDS_OWNER_UID|SD_BUS_CREDS_AUGMENT, &creds);
r = sd_bus_query_sender_creds(message,
SD_BUS_CREDS_EUID|SD_BUS_CREDS_OWNER_UID|SD_BUS_CREDS_AUGMENT,
&creds);
if (r < 0)
return r;
if (!uid_is_valid(uid)) {
/* Note that we get the owner UID of the session or user unit,
* not the actual client UID here! */
/* Note that we get the owner UID of the session or user unit, not the actual client UID here! */
r = sd_bus_creds_get_owner_uid(creds, &uid);
if (r < 0)
return r;
@ -1450,6 +1447,8 @@ static int method_set_user_linger(sd_bus_message *message, void *userdata, sd_bu
if (r < 0)
return r;
_cleanup_free_ struct passwd *pw = NULL;
r = getpwuid_malloc(uid, &pw);
if (r < 0)
return r;
@ -1473,24 +1472,30 @@ static int method_set_user_linger(sd_bus_message *message, void *userdata, sd_bu
if (r < 0)
return r;
cc = cescape(pw->pw_name);
if (!cc)
_cleanup_free_ char *escaped = NULL;
const char *path;
User *u;
escaped = cescape(pw->pw_name);
if (!escaped)
return -ENOMEM;
path = strjoina("/var/lib/systemd/linger/", cc);
if (b) {
User *u;
path = strjoina("/var/lib/systemd/linger/", escaped);
if (enable) {
r = touch(path);
if (r < 0)
return r;
if (manager_add_user_by_uid(m, uid, &u) >= 0)
user_start(u);
if (manager_add_user_by_uid(m, uid, &u) >= 0) {
r = user_start(u);
if (r < 0) {
user_add_to_gc_queue(u);
return r;
}
}
} else {
User *u;
r = unlink(path);
if (r < 0 && errno != ENOENT)
return -errno;