summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSoumya <soumya.sambu@windriver.com>2023-03-31 16:26:51 +0000
committerSteve Sakoman <steve@sakoman.com>2023-04-14 06:30:30 -1000
commitd4e7033be5943648991248dd3115ea1a015576d2 (patch)
tree0d5274f6c5259092048e27dd96d8ee5ea2506705 /meta
parent6310d789e6352461e58b311c7d07c2f7e836f9d0 (diff)
downloadpoky-d4e7033be5943648991248dd3115ea1a015576d2.tar.gz
shadow: Fix can not print full login timeout message
When we do not enter password during login, it is expected to display message "Login timed out after 60 seconds". But it prints only first few bytes(like "Login t") when write is immediately followed by exit. Fix - Calling exit from new handler provides enough time to display full message. Upstream-Status: Accepted [https://github.com/shadow-maint/shadow/commit/670cae834827a8f794e6f7464fa57790d911b63c] (From OE-Core rev: e5c1b64ea66fb1cbdb6403fa26d4d42b9d64e44f) Signed-off-by: Soumya <soumya.sambu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 644cfe9dcf351bfa6c67f4b4d1e7dec416a59021) Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch41
-rw-r--r--meta/recipes-extended/shadow/shadow.inc1
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch b/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch
new file mode 100644
index 0000000000..37ba5f3dc2
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch
@@ -0,0 +1,41 @@
1commit 670cae834827a8f794e6f7464fa57790d911b63c
2Author: SoumyaWind <121475834+SoumyaWind@users.noreply.github.com>
3Date: Tue Dec 27 17:40:17 2022 +0530
4
5 shadow: Fix can not print full login timeout message
6
7 Login timed out message prints only first few bytes when write is immediately followed by exit.
8 Calling exit from new handler provides enough time to display full message.
9
10Upstream-Status: Accepted [https://github.com/shadow-maint/shadow/commit/670cae834827a8f794e6f7464fa57790d911b63c]
11
12diff --git a/src/login.c b/src/login.c
13index 116e2cb3..c55f4de0 100644
14--- a/src/login.c
15+++ b/src/login.c
16@@ -120,6 +120,7 @@ static void get_pam_user (char **ptr_pam_user);
17
18 static void init_env (void);
19 static void alarm_handler (int);
20+static void exit_handler (int);
21
22 /*
23 * usage - print login command usage and exit
24@@ -391,11 +392,16 @@ static void init_env (void)
25 #endif /* !USE_PAM */
26 }
27
28+static void exit_handler (unused int sig)
29+{
30+ _exit (0);
31+}
32
33 static void alarm_handler (unused int sig)
34 {
35 write (STDERR_FILENO, tmsg, strlen (tmsg));
36- _exit (0);
37+ signal(SIGALRM, exit_handler);
38+ alarm(2);
39 }
40
41 #ifdef USE_PAM
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index 5656a375b7..0ed220ac5c 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -15,6 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \
15 file://0001-shadow-use-relaxed-usernames.patch \ 15 file://0001-shadow-use-relaxed-usernames.patch \
16 ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ 16 ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \
17 file://useradd \ 17 file://useradd \
18 file://0001-Fix-can-not-print-full-login.patch \
18 " 19 "
19 20
20SRC_URI:append:class-target = " \ 21SRC_URI:append:class-target = " \