diff options
| author |   djm <djm@openbsd.org> | 2020-04-03 04:03:51 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-04-03 04:03:51 +0000 |
| commit | 26316f0fa96ee571e399bb82034b0451d9806e07 (patch) | |
| tree | ee2da4752c5e494f651089459d066e1db247358a /usr.bin/ssh/ssh.c | |
| parent | Adjust SMR_ASSERT_CRITICAL() and SMR_ASSERT_NONCRITICAL() so that the (diff) | |
| download | wireguard-openbsd-26316f0fa96ee571e399bb82034b0451d9806e07.tar.xz wireguard-openbsd-26316f0fa96ee571e399bb82034b0451d9806e07.zip | |
the tunnel-forwarding vs ExitOnForwardFailure fix that I committed
earlier had an off-by-one. Fix this and add some debugging that would
have made it apparent sooner.
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index cbb0df6ee75..8a44d3dd877 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.523 2020/04/03 02:40:32 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.524 2020/04/03 04:03:51 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1649,10 +1649,15 @@ fork_postauth(void) static void forwarding_success(void) { - if (forward_confirms_pending > 0 && --forward_confirms_pending == 0) { - debug("All forwarding requests processed"); + if (forward_confirms_pending == -1) + return; + if (--forward_confirms_pending == 0) { + debug("%s: all expected forwarding replies received"); if (fork_after_authentication_flag) fork_postauth(); + } else { + debug2("%s: %d expected forwarding replies remaining", + __func__, forward_confirms_pending); } } @@ -1773,6 +1778,8 @@ ssh_init_forwarding(struct ssh *ssh, char **ifname) int success = 0; int i; + if (options.exit_on_forward_failure) + forward_confirms_pending = 0; /* track pending requests */ /* Initiate local TCP/IP port forwardings. */ for (i = 0; i < options.num_local_forwards; i++) { debug("Local connections to %.200s:%d forwarded to remote " @@ -1832,6 +1839,10 @@ ssh_init_forwarding(struct ssh *ssh, char **ifname) else error("Could not request tunnel forwarding."); } + if (forward_confirms_pending > 0) { + debug("%s: expecting replies for %d forwards", __func__, + forward_confirms_pending); + } } static void |