summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorGleydson Soares <gsoares@cvs.openbsd.org>2016-09-03 10:48:16 +0000
committerGleydson Soares <gsoares@cvs.openbsd.org>2016-09-03 10:48:16 +0000
commita3f5b3e35ad9b46cd1b7d1176d67b6c3f0691dec (patch)
tree6e20d3afec1618e682f30ef16a4207f536200532 /libexec
parent904edec260640551c58b8b8ccd364d55a72ffb1b (diff)
convert to use readpassphrase() instead of DEPRECATED/getpass()
OK millert@
Diffstat (limited to 'libexec')
-rw-r--r--libexec/login_lchpass/login_lchpass.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/libexec/login_lchpass/login_lchpass.c b/libexec/login_lchpass/login_lchpass.c
index b799d9e5237..a81098e123a 100644
--- a/libexec/login_lchpass/login_lchpass.c
+++ b/libexec/login_lchpass/login_lchpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_lchpass.c,v 1.19 2016/08/01 17:04:18 jca Exp $ */
+/* $OpenBSD: login_lchpass.c,v 1.20 2016/09/03 10:48:15 gsoares Exp $ */
/*-
* Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved.
@@ -51,6 +51,7 @@
#include <unistd.h>
#include <stdarg.h>
#include <login_cap.h>
+#include <readpassphrase.h>
#define BACK_CHANNEL 3
@@ -61,7 +62,8 @@ main(int argc, char *argv[])
{
struct iovec iov[2];
struct passwd *pwd;
- char *username = NULL, *hash = NULL, *p;
+ char *username = NULL, *hash = NULL;
+ char oldpass[1024];
struct rlimit rl;
int c;
@@ -122,14 +124,15 @@ main(int argc, char *argv[])
(void)setpriority(PRIO_PROCESS, 0, -4);
(void)printf("Changing local password for %s.\n", username);
- if ((p = getpass("Old Password:")) == NULL)
+ if ((readpassphrase("Old Password:", oldpass, sizeof(oldpass),
+ RPP_ECHO_OFF)) == NULL)
exit(1);
- if (crypt_checkpass(p, hash) != 0) {
- explicit_bzero(p, strlen(p));
+ if (crypt_checkpass(oldpass, hash) != 0) {
+ explicit_bzero(oldpass, strlen(oldpass));
exit(1);
}
- explicit_bzero(p, strlen(p));
+ explicit_bzero(oldpass, strlen(oldpass));
/*
* We rely on local_passwd() to block signals during the