diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2021-08-30 19:14:33 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2021-08-30 19:14:33 +0000 |
| commit | 66719ee573ac2290622db642f6e89ab35b179f3d (patch) | |
| tree | 4691c20089f921c6460b2a6d5ae27b632651a9f3 /sshconnect.c | |
| parent | cbaad7c77fb842fe6b6be03cbdb3e85a6de759bf (diff) | |
Diffstat (limited to 'sshconnect.c')
| -rw-r--r-- | sshconnect.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sshconnect.c b/sshconnect.c index 47f0b1c93abf..fcf87bb76f64 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.352 2021/04/03 06:18:41 djm Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.355 2021/07/02 05:11:21 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -865,7 +865,7 @@ load_hostkeys_command(struct hostkeys *hostkeys, const char *command_template, osigchld = ssh_signal(SIGCHLD, SIG_DFL); /* Turn the command into an argument vector */ - if (argv_split(command_template, &ac, &av) != 0) { + if (argv_split(command_template, &ac, &av, 0) != 0) { error("%s \"%s\" contains invalid quotes", tag, command_template); goto out; @@ -1298,13 +1298,6 @@ check_host_key(char *hostname, const struct ssh_conn_info *cinfo, error("Keyboard-interactive authentication is disabled" " to avoid man-in-the-middle attacks."); options.kbd_interactive_authentication = 0; - options.challenge_response_authentication = 0; - cancelled_forwarding = 1; - } - if (options.challenge_response_authentication) { - error("Challenge/response authentication is disabled" - " to avoid man-in-the-middle attacks."); - options.challenge_response_authentication = 0; cancelled_forwarding = 1; } if (options.forward_agent) { @@ -1346,7 +1339,7 @@ check_host_key(char *hostname, const struct ssh_conn_info *cinfo, * XXX Should permit the user to change to use the new id. * This could be done by converting the host key to an * identifying sentence, tell that the host identifies itself - * by that sentence, and ask the user if he/she wishes to + * by that sentence, and ask the user if they wish to * accept the authentication. */ break; |