diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-31 07:00:13 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-06-01 14:53:33 +1000 |
commit | 92e9fe633130376a95dd533df6e5e6a578c1e6b8 (patch) | |
tree | c6f037e447c3c6fe4d79a71fb5a14f712f739617 /sshd.c | |
parent | 17ad5b346043c5bbc5befa864d0dbeb76be39390 (diff) |
upstream commit
remove now obsolete ctx from ssh_dispatch_run; ok djm@
Upstream-ID: 9870aabf7f4d71660c31fda91b942b19a8e68d29
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.488 2017/05/30 08:52:20 markus Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.489 2017/05/31 07:00:13 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2191,7 +2191,7 @@ do_ssh2_kex(void) | |||
2191 | kex->host_key_index=&get_hostkey_index; | 2191 | kex->host_key_index=&get_hostkey_index; |
2192 | kex->sign = sshd_hostkey_sign; | 2192 | kex->sign = sshd_hostkey_sign; |
2193 | 2193 | ||
2194 | dispatch_run(DISPATCH_BLOCK, &kex->done, active_state); | 2194 | ssh_dispatch_run_fatal(active_state, DISPATCH_BLOCK, &kex->done); |
2195 | 2195 | ||
2196 | session_id2 = kex->session_id; | 2196 | session_id2 = kex->session_id; |
2197 | session_id2_len = kex->session_id_len; | 2197 | session_id2_len = kex->session_id_len; |