You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
938 B
29 lines
938 B
11 months ago
|
From c57daab191c6551ac757576fcf7df45fd9790b6b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Tue, 22 Nov 2022 12:56:38 +0100
|
||
|
|
Subject: [PATCH] utmp-wtmp: fix error in case isatty() fails
|
||
|
|
|
||
|
|
(cherry picked from commit 80b780ba178a84b248ecee47eef82358480c9492)
|
||
|
|
|
||
|
|
Related: #2172846
|
||
|
|
---
|
||
|
|
src/shared/utmp-wtmp.c | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
|
||
|
|
index ef9427fa7b..743b784489 100644
|
||
|
|
--- a/src/shared/utmp-wtmp.c
|
||
|
|
+++ b/src/shared/utmp-wtmp.c
|
||
|
|
@@ -312,8 +312,10 @@ static int write_to_terminal(const char *tty, const char *message) {
|
||
|
|
assert(message);
|
||
|
|
|
||
|
|
fd = open(tty, O_WRONLY|O_NONBLOCK|O_NOCTTY|O_CLOEXEC);
|
||
|
|
- if (fd < 0 || !isatty(fd))
|
||
|
|
+ if (fd < 0)
|
||
|
|
return -errno;
|
||
|
|
+ if (!isatty(fd))
|
||
|
|
+ return -ENOTTY;
|
||
|
|
|
||
|
|
p = message;
|
||
|
|
left = strlen(message);
|