[BusyBox-cvs] busybox/loginutils passwd.c, 1.6, 1.7 sulogin.c, 1.2,
1.3 vlock.c, 1.3, 1.4
Erik Andersen
andersen at busybox.net
Sat May 1 01:27:33 UTC 2004
Update of /var/cvs/busybox/loginutils
In directory nail:/tmp/cvs-serv16282/loginutils
Modified Files:
passwd.c sulogin.c vlock.c
Log Message:
Do not use getpass(3)
Index: passwd.c
===================================================================
RCS file: /var/cvs/busybox/loginutils/passwd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/passwd.c 4 Sep 2003 08:21:36 -0000 1.6
+++ b/passwd.c 1 May 2004 01:27:30 -0000 1.7
@@ -332,7 +332,7 @@
time_t start, now;
if (!amroot && crypt_passwd[0]) {
- if (!(clear = getpass("Old password:"))) {
+ if (!(clear = bb_askpass(0, "Old password:"))) {
/* return -1; */
return 1;
}
@@ -356,7 +356,7 @@
} else {
orig[0] = '\0';
}
- if (! (cp=getpass("Enter the new password (minimum of 5, maximum of 8 characters)\n"
+ if (! (cp=bb_askpass(0, "Enter the new password (minimum of 5, maximum of 8 characters)\n"
"Please use a combination of upper and lower case letters and numbers.\n"
"Enter new password: ")))
{
@@ -375,7 +375,7 @@
return 1;
}
}
- if (!(cp = getpass("Re-enter new password: "))) {
+ if (!(cp = bb_askpass(0, "Re-enter new password: "))) {
bzero(orig, sizeof orig);
/* return -1; */
return 1;
Index: vlock.c
===================================================================
RCS file: /var/cvs/busybox/loginutils/vlock.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/vlock.c 19 Mar 2003 09:12:20 -0000 1.3
+++ b/vlock.c 1 May 2004 01:27:30 -0000 1.4
@@ -193,10 +193,9 @@
snprintf(prompt, 100, "%s's password: ", pw->pw_name);
- if ((pass = getpass(prompt)) == NULL) {
- perror("getpass");
+ if ((pass = bb_askpass(0, prompt)) == NULL) {
restore_terminal();
- exit(1);
+ bb_perror_msg_and_die("password");
}
crypt_pass = pw_encrypt(pass, pw->pw_passwd);
@@ -210,9 +209,8 @@
memset(crypt_pass, 0, strlen(crypt_pass));
if (isatty(STDIN_FILENO) == 0) {
- perror("isatty");
restore_terminal();
- exit(1);
+ bb_perror_msg_and_die("isatty");
}
sleep(++times);
Index: sulogin.c
===================================================================
RCS file: /var/cvs/busybox/loginutils/sulogin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/sulogin.c 19 Mar 2003 09:12:20 -0000 1.2
+++ b/sulogin.c 1 May 2004 01:27:30 -0000 1.3
@@ -5,7 +5,6 @@
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
-#include <termios.h>
#include <unistd.h>
#include <utmp.h>
#include <sys/resource.h>
@@ -55,7 +54,6 @@
const char *name = "root";
int timeout = 0;
static char pass[BUFSIZ];
- struct termios termio;
struct passwd pwent;
struct passwd *pwd;
time_t start, now;
@@ -64,28 +62,6 @@
struct spwd *spwd = NULL;
#endif /* CONFIG_FEATURE_SHADOWPASSWDS */
- tcgetattr(0, &termio);
- /* set control chars */
- termio.c_cc[VINTR] = 3; /* C-c */
- termio.c_cc[VQUIT] = 28; /* C-\ */
- termio.c_cc[VERASE] = 127; /* C-? */
- termio.c_cc[VKILL] = 21; /* C-u */
- termio.c_cc[VEOF] = 4; /* C-d */
- termio.c_cc[VSTART] = 17; /* C-q */
- termio.c_cc[VSTOP] = 19; /* C-s */
- termio.c_cc[VSUSP] = 26; /* C-z */
- /* use line dicipline 0 */
- termio.c_line = 0;
- /* Make it be sane */
- termio.c_cflag &= CBAUD|CBAUDEX|CSIZE|CSTOPB|PARENB|PARODD;
- termio.c_cflag |= CREAD|HUPCL|CLOCAL;
- /* input modes */
- termio.c_iflag = ICRNL | IXON | IXOFF;
- /* output modes */
- termio.c_oflag = OPOST | ONLCR;
- /* local modes */
- termio.c_lflag = ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHOCTL | ECHOKE | IEXTEN;
- tcsetattr(0, TCSANOW, &termio);
openlog("sulogin", LOG_PID | LOG_CONS | LOG_NOWAIT, LOG_AUTH);
if (argc > 1) {
if (strncmp(argv[1], "-t", 2) == 0) {
@@ -132,7 +108,6 @@
signal(SIGALRM, catchalarm);
- alarm(timeout);
if (!(pwd = getpwnam(name))) {
syslog(LOG_WARNING, "No password entry for `root'\n");
bb_error_msg_and_die("No password entry for `root'\n");
@@ -150,7 +125,7 @@
}
#endif /* CONFIG_FEATURE_SHADOWPASSWDS */
while (1) {
- cp = getpass(SULOGIN_PROMPT);
+ cp = bb_askpass(timeout, SULOGIN_PROMPT);
if (!cp || !*cp) {
puts("\n");
fflush(stdout);
@@ -174,7 +149,6 @@
syslog(LOG_WARNING, "Incorrect root password\n");
}
bzero(pass, strlen(pass));
- alarm(0);
signal(SIGALRM, SIG_DFL);
puts("Entering System Maintenance Mode\n");
fflush(stdout);
More information about the busybox-cvs
mailing list