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

Sulogin: if zero is read at reading the passwd guess it's done.

Browse Source
This commit is contained in:
Werner Fink 2011-07-26 12:03:13 +00:00
parent eddea371ca
commit 09aa81cdbb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/Changelog
View File

@ -30,6 +30,7 @@ sysvinit (2.89dsf) UNRELEASED; urgency=low
* Make quotes visible in example of the manual page of fstab-decode * Make quotes visible in example of the manual page of fstab-decode
* Sulogin: enforce reconnection of stdin/stdout/stderr if a device * Sulogin: enforce reconnection of stdin/stdout/stderr if a device
was specified. was specified.
* Sulogin: if zero is read at reading the passwd guess it's done.
[ Petter Reinholdtsen ] [ Petter Reinholdtsen ]
* Next release will be 2.89dsf. * Next release will be 2.89dsf.

5
src/sulogin.c
View File

@ -636,7 +636,7 @@ char *getpasswd(struct console *con)
cp->eol = *ptr = '\0'; cp->eol = *ptr = '\0';
eightbit = ((con->flags & CON_SERIAL) == 0 || (tty.c_cflag & (PARODD|PARENB)) == 0); eightbit = ((con->flags & CON_SERIAL) == 0 || (tty.c_cflag & (PARODD|PARENB)) == 0);
while (cp->eol == 0) { while (cp->eol == '\0') {
if (read(fd, &c, 1) < 1) { if (read(fd, &c, 1) < 1) {
if (errno == EINTR || errno == EAGAIN) { if (errno == EINTR || errno == EAGAIN) {
usleep(1000); usleep(1000);
@ -669,6 +669,9 @@ char *getpasswd(struct console *con)
} }
switch (ascval) { switch (ascval) {
case 0:
*ptr = '\0';
goto quit;
case CR: case CR:
case NL: case NL:
*ptr = '\0'; *ptr = '\0';