emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sulogin: allow system maintenance login if root password is empty

Browse Source 
The current password checking is unable to distinguish between the user
entering an empty password or pressing Control-D. As a result, an empty
password always results in normal startup.

We modify bb_ask to return NULL if Control-D is pressed without entering
a password. The sulogin applet is then modified to only proceed to
normal startup if bb_ask returns NULL. This covers EOF with no password,
interrupt by timeout and ^C.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Jonathan Liu 2013-05-21 17:01:55 +02:00 committed by Denys Vlasenko
parent 9cb1e2f86b
commit b6dc13c2d3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libbb/bb_askpass.c
View File

@ -65,7 +65,9 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
i = 0; i = 0;
while (1) { while (1) {
int r = read(fd, &ret[i], 1); int r = read(fd, &ret[i], 1);
if (r < 0) { if ((i == 0 && r == 0) /* EOF (^D) with no password */
|| r < 0
) {
/* read is interrupted by timeout or ^C */ /* read is interrupted by timeout or ^C */
ret = NULL; ret = NULL;
break; break;

4
loginutils/sulogin.c
View File

@ -83,8 +83,8 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
cp = bb_ask(STDIN_FILENO, timeout, cp = bb_ask(STDIN_FILENO, timeout,
"Give root password for system maintenance\n" "Give root password for system maintenance\n"
"(or type Control-D for normal startup):"); "(or type Control-D for normal startup):");
if (!cp) {
if (!cp || !*cp) { /* ^D, ^C, timeout, or read error */
bb_info_msg("Normal startup"); bb_info_msg("Normal startup");
return 0; return 0;
} }