diff options
| author |   markus <markus@openbsd.org> | 2017-05-31 07:00:13 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2017-05-31 07:00:13 +0000 |
| commit | 65d0ff1d6d5e2b91028be839df4d05ab2aaf4a20 (patch) | |
| tree | 94544659276bfc1adc5d38cfe53591527247fafe /usr.bin/ssh/sshconnect2.c | |
| parent | Allow replacement of UTF-8 characters in vi mode. (diff) | |
| download | wireguard-openbsd-65d0ff1d6d5e2b91028be839df4d05ab2aaf4a20.tar.xz wireguard-openbsd-65d0ff1d6d5e2b91028be839df4d05ab2aaf4a20.zip | |
remove now obsolete ctx from ssh_dispatch_run; ok djm@
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index be0a4e6db6c..3a5833eb5fc 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.262 2017/05/31 05:08:46 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.263 2017/05/31 07:00:13 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -209,7 +209,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) kex->server_version_string=server_version_string; kex->verify_host_key=&verify_host_key_callback; - dispatch_run(DISPATCH_BLOCK, &kex->done, active_state); + ssh_dispatch_run_fatal(active_state, DISPATCH_BLOCK, &kex->done); /* remove ext-info from the KEX proposals for rekeying */ myproposal[PROPOSAL_KEX_ALGS] = @@ -393,7 +393,7 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host, ssh_dispatch_init(ssh, &input_userauth_error); ssh_dispatch_set(ssh, SSH2_MSG_EXT_INFO, &input_userauth_ext_info); ssh_dispatch_set(ssh, SSH2_MSG_SERVICE_ACCEPT, &input_userauth_service_accept); - ssh_dispatch_run(ssh, DISPATCH_BLOCK, &authctxt.success, ssh); /* loop until success */ + ssh_dispatch_run_fatal(ssh, DISPATCH_BLOCK, &authctxt.success); /* loop until success */ ssh->authctxt = NULL; pubkey_cleanup(&authctxt); |