diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-04-20 06:19:11 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-04-20 07:08:54 +0200 |
| commit | fec014785de198b9a325d1b94e324bb958c5fe7b (patch) | |
| tree | ab60bc19e921a7ea0765abf6c55cdcf9a59a25fd /serverloop.c | |
| parent | upstream: Import regenerated moduli (diff) | |
| download | openssh-fec014785de198b9a325d1b94e324bb958c5fe7b.tar.xz openssh-fec014785de198b9a325d1b94e324bb958c5fe7b.zip | |
upstream: Try to continue running local I/O for channels in state
OPEN during SSH transport rekeying. The most visible benefit is that it
should make ~-escapes work in the client (e.g. to exit) if the connection
happened to have stalled during a rekey event. Based work by and ok dtucker@
OpenBSD-Commit-ID: a66e8f254e92edd4ce09c9f750883ec8f1ea5f45
Diffstat (limited to 'serverloop.c')
| -rw-r--r-- | serverloop.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/serverloop.c b/serverloop.c index 0541f028a..b4c0d82b2 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.231 2022/01/22 00:49:34 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.232 2022/04/20 04:19:11 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -392,8 +392,7 @@ server_loop2(struct ssh *ssh, Authctxt *authctxt) cleanup_exit(255); } - if (!ssh_packet_is_rekeying(ssh)) - channel_after_poll(ssh, pfd, npfd_active); + channel_after_poll(ssh, pfd, npfd_active); if (conn_in_ready && process_input(ssh, connection_in) < 0) break; |