[openssh-commits] [openssh] 07/09: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit b1e72df2b813ecc15bd0152167bf4af5f91c36d3
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Fri Jul 14 03:18:21 2017 +0000

    upstream commit
    
    Make ""Killed by signal 1" LogLevel verbose so it's not
    shown at the default level.  Prevents it from appearing during ssh -J and
    equivalent ProxyCommand configs. bz#1906, bz#2744, feedback&ok markus@
    
    Upstream-ID: debfaa7e859b272246c2f2633335d288d2e2ae28
---
 clientloop.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/clientloop.c b/clientloop.c
index b6443ced..248c9541 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.300 2017/06/23 07:24:48 mestre Exp $ */
+/* $OpenBSD: clientloop.c,v 1.301 2017/07/14 03:18:21 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1418,8 +1418,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
 		exit_status = 0;
 	}
 
-	if (received_signal)
-		fatal("Killed by signal %d.", (int) received_signal);
+	if (received_signal) {
+		verbose("Killed by signal %d.", (int) received_signal);
+		cleanup_exit(0);
+	}
 
 	/*
 	 * In interactive mode (with pseudo tty) display a message indicating

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.