shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-24 17:57:34 +03:00
Code

shared/wall: fall back to logind if utmpx database doesn't exist

Browse Source
This commit is contained in:
Mike Yuan 2023-09-09 02:01:57 +08:00
parent 056aff96b9
commit 560f15fc8f
No known key found for this signature in database
GPG Key ID: 417471C0A40F58B3
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/shared/wall.c
View File

@ -36,18 +36,27 @@ static int write_to_terminal(const char *tty, const char *message) {
return loop_write_full(fd, message, SIZE_MAX, TIMEOUT_USEC); return loop_write_full(fd, message, SIZE_MAX, TIMEOUT_USEC);
} }
#if ENABLE_UTMP
static int wall_utmp( static int wall_utmp(
const char *message, const char *message,
bool (*match_tty)(const char *tty, bool is_local, void *userdata), bool (*match_tty)(const char *tty, bool is_local, void *userdata),
void *userdata) { void *userdata) {
#if ENABLE_UTMP
_unused_ _cleanup_(utxent_cleanup) bool utmpx = false; _unused_ _cleanup_(utxent_cleanup) bool utmpx = false;
struct utmpx *u; struct utmpx *u;
int r = 0; int r = 0;
assert(message); assert(message);
/* libc's setutxent() unfortunately doesn't inform us about success, i.e. whether /var/run/utmp
* exists. Hence we have to check manually first. */
if (access(_PATH_UTMPX, F_OK) < 0) {
if (errno == ENOENT)
return -ENOPROTOOPT;
return -errno;
}
utmpx = utxent_start(); utmpx = utxent_start();
while ((u = getutxent())) { while ((u = getutxent())) {
@ -77,15 +86,18 @@ static int wall_utmp(
} }
return r; return r;
}
#endif
#if ENABLE_LOGIND #else
return -ENOPROTOOPT;
#endif
}
static int wall_logind( static int wall_logind(
const char *message, const char *message,
bool (*match_tty)(const char *tty, bool is_local, void *userdata), bool (*match_tty)(const char *tty, bool is_local, void *userdata),
void *userdata) { void *userdata) {
#if ENABLE_LOGIND
_cleanup_strv_free_ char **sessions = NULL; _cleanup_strv_free_ char **sessions = NULL;
int r; int r;
@ -120,8 +132,11 @@ static int wall_logind(
} }
return r; return r;
}
#else
return -ENOPROTOOPT;
#endif #endif
}
int wall( int wall(
const char *message, const char *message,
@ -131,6 +146,7 @@ int wall(
void *userdata) { void *userdata) {
_cleanup_free_ char *text = NULL, *hostname = NULL, *username_alloc = NULL, *stdin_tty = NULL; _cleanup_free_ char *text = NULL, *hostname = NULL, *username_alloc = NULL, *stdin_tty = NULL;
int r;
assert(message); assert(message);
@ -161,11 +177,11 @@ int wall(
message) < 0) message) < 0)
return -ENOMEM; return -ENOMEM;
#if ENABLE_UTMP r = wall_utmp(text, match_tty, userdata);
return wall_utmp(text, match_tty, userdata); if (r == -ENOPROTOOPT)
#elif ENABLE_LOGIND r = wall_logind(text, match_tty, userdata);
return wall_logind(text, match_tty, userdata);
#endif return r == -ENOPROTOOPT ? 0 : r;
} }
#endif #endif