===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- src/usr.bin/ssh/ssh.c	2020/04/03 02:40:32	1.523
+++ src/usr.bin/ssh/ssh.c	2020/04/03 04:03:51	1.524
@@ -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 @@
 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 @@
 	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 "
@@ -1831,6 +1838,10 @@
 			fatal("Could not request tunnel forwarding.");
 		else
 			error("Could not request tunnel forwarding.");
+	}
+	if (forward_confirms_pending > 0) {
+		debug("%s: expecting replies for %d forwards", __func__,
+		    forward_confirms_pending);
 	}
 }