From 22548184de4fe7218da9dbb22f9dd176affdf96b Mon Sep 17 00:00:00 2001 From: markus Date: Sun, 24 Jun 2001 05:35:33 +0000 Subject: switch to readpassphrase(3) 2.7/8-stable needs readpassphrase.[ch] from libc --- usr.bin/ssh/sshconnect2.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'usr.bin/ssh/sshconnect2.c') diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 1f57c3a9f5d..5f4943ba80f 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.76 2001/06/23 15:12:21 itojun Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.77 2001/06/24 05:35:34 markus Exp $"); #include #include @@ -45,7 +45,6 @@ RCSID("$OpenBSD: sshconnect2.c,v 1.76 2001/06/23 15:12:21 itojun Exp $"); #include "key.h" #include "sshconnect.h" #include "authfile.h" -#include "cli.h" #include "dh.h" #include "authfd.h" #include "log.h" @@ -770,9 +769,9 @@ input_userauth_info_req(int type, int plen, void *ctxt) inst = packet_get_string(NULL); lang = packet_get_string(NULL); if (strlen(name) > 0) - cli_mesg(name); + log(name); if (strlen(inst) > 0) - cli_mesg(inst); + log(inst); xfree(name); xfree(inst); xfree(lang); @@ -792,7 +791,7 @@ input_userauth_info_req(int type, int plen, void *ctxt) prompt = packet_get_string(NULL); echo = packet_get_char(); - response = cli_prompt(prompt, echo); + response = read_passphrase(prompt, echo ? RP_ECHO : 0); packet_put_cstring(response); memset(response, 0, strlen(response)); -- cgit v1.2.3-59-g8ed1b