system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-24 03:36:24 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #30744 from poettering/logind-trivial-tweaks

Browse source 
logind: 3 trivial cleanups
This commit is contained in:
Lennart Poettering 2024-01-04 16:02:20 +01:00 committed by GitHub
parent 20604ff219 3dc8b2df12
commit 115d6abf87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/home/homed-manager-bus.c
View file

@ -317,6 +317,10 @@ static int generic_home_method(
Home *h;
int r;
assert(m);
assert(message);
assert(handler);
r = sd_bus_message_read(message, "s", &user_name);
if (r < 0)
return r;

4
src/home/pam_systemd_home.c
View file

@ -275,11 +275,11 @@ static int handle_generic_user_record_error(
const sd_bus_error *error,
bool debug) {
int r;
assert(user_name);
assert(error);
int r;
/* Logs about all errors, except for PAM_CONV_ERR, i.e. when requesting more info failed. */
if (sd_bus_error_has_name(error, BUS_ERROR_HOME_ABSENT)) {

35
src/login/logind-session.c
View file

@ -870,17 +870,17 @@ int session_start(Session *s, sd_bus_message *properties, sd_bus_error *error) {
user_elect_display(s->user);
/* Save data */
session_save(s);
user_save(s->user);
(void) session_save(s);
(void) user_save(s->user);
if (s->seat)
seat_save(s->seat);
(void) seat_save(s->seat);
/* Send signals */
session_send_signal(s, true);
user_send_changed(s->user, "Display", NULL);
if (s->seat && s->seat->active == s)
seat_send_changed(s->seat, "ActiveSession", NULL);
(void) seat_send_changed(s->seat, "ActiveSession", NULL);
return 0;
}
@ -966,8 +966,8 @@ int session_stop(Session *s, bool force) {
user_elect_display(s->user);
session_save(s);
user_save(s->user);
(void) session_save(s);
(void) user_save(s->user);
return r;
}
@ -1015,8 +1015,8 @@ int session_finalize(Session *s) {
session_reset_leader(s, /* keep_fdstore = */ false);
user_save(s->user);
user_send_changed(s->user, "Display", NULL);
(void) user_save(s->user);
(void) user_send_changed(s->user, "Display", NULL);
return 0;
}
@ -1192,9 +1192,8 @@ void session_set_type(Session *s, SessionType t) {
return;
s->type = t;
session_save(s);
session_send_changed(s, "Type", NULL);
(void) session_save(s);
(void) session_send_changed(s, "Type", NULL);
}
int session_set_display(Session *s, const char *display) {
@ -1207,9 +1206,8 @@ int session_set_display(Session *s, const char *display) {
if (r <= 0) /* 0 means the strings were equal */
return r;
session_save(s);
session_send_changed(s, "Display", NULL);
(void) session_save(s);
(void) session_send_changed(s, "Display", NULL);
return 1;
}
@ -1224,9 +1222,8 @@ int session_set_tty(Session *s, const char *tty) {
if (r <= 0) /* 0 means the strings were equal */
return r;
session_save(s);
session_send_changed(s, "TTY", NULL);
(void) session_save(s);
(void) session_send_changed(s, "TTY", NULL);
return 1;
}
@ -1600,7 +1597,7 @@ int session_set_controller(Session *s, const char *sender, bool force, bool prep
session_release_controller(s, true);
s->controller = TAKE_PTR(name);
session_save(s);
(void) session_save(s);
return 0;
}
@ -1614,7 +1611,7 @@ void session_drop_controller(Session *s) {
s->track = sd_bus_track_unref(s->track);
session_set_type(s, s->original_type);
session_release_controller(s, false);
session_save(s);
(void) session_save(s);
session_restore_vt(s);
}