[openssh-commits] [openssh] 04/04: upstream: use sshpkt_fatal() instead of plain fatal() for

[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 afeb6a960da23f0a5cbc4b80cca107c7504e932a
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Thu Jan 30 07:21:38 2020 +0000

    upstream: use sshpkt_fatal() instead of plain fatal() for
    
    ssh_packet_write_poll() failures here too as the former yields better error
    messages; ok dtucker@
    
    OpenBSD-Commit-ID: 1f7a6ca95bc2b716c2e948fc1370753be772d8e3
---
 serverloop.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/serverloop.c b/serverloop.c
index a8c99e2e..340b19a5 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.221 2020/01/25 22:41:01 djm Exp $ */
+/* $OpenBSD: serverloop.c,v 1.222 2020/01/30 07:21:38 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -359,9 +359,10 @@ process_output(struct ssh *ssh, fd_set *writeset, int connection_out)
 
 	/* Send any buffered packet data to the client. */
 	if (FD_ISSET(connection_out, writeset)) {
-		if ((r = ssh_packet_write_poll(ssh)) != 0)
-			fatal("%s: ssh_packet_write_poll: %s",
-			    __func__, ssh_err(r));
+		if ((r = ssh_packet_write_poll(ssh)) != 0) {
+			sshpkt_fatal(ssh, r, "%s: ssh_packet_write_poll",
+			    __func__);
+		}
 	}
 }
 

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