Module Name: src Committed By: christos Date: Sat Sep 29 15:10:45 UTC 2018
Modified Files: src/crypto/external/bsd/openssh/dist: monitor_wrap.c packet.c serverloop.c Log Message: be less aggressive about blocking connections from disconnected sessions. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 \ src/crypto/external/bsd/openssh/dist/monitor_wrap.c \ src/crypto/external/bsd/openssh/dist/serverloop.c cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/packet.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/openssh/dist/monitor_wrap.c diff -u src/crypto/external/bsd/openssh/dist/monitor_wrap.c:1.21 src/crypto/external/bsd/openssh/dist/monitor_wrap.c:1.22 --- src/crypto/external/bsd/openssh/dist/monitor_wrap.c:1.21 Sun Aug 26 03:46:36 2018 +++ src/crypto/external/bsd/openssh/dist/monitor_wrap.c Sat Sep 29 11:10:44 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: monitor_wrap.c,v 1.21 2018/08/26 07:46:36 christos Exp $ */ +/* $NetBSD: monitor_wrap.c,v 1.22 2018/09/29 15:10:44 christos Exp $ */ /* $OpenBSD: monitor_wrap.c,v 1.107 2018/07/20 03:46:34 djm Exp $ */ /* @@ -28,7 +28,7 @@ */ #include "includes.h" -__RCSID("$NetBSD: monitor_wrap.c,v 1.21 2018/08/26 07:46:36 christos Exp $"); +__RCSID("$NetBSD: monitor_wrap.c,v 1.22 2018/09/29 15:10:44 christos Exp $"); #include <sys/types.h> #include <sys/uio.h> #include <sys/queue.h> @@ -151,7 +151,7 @@ mm_request_receive(int sock, struct sshb if (atomicio(read, sock, buf, sizeof(buf)) != sizeof(buf)) { if (errno == EPIPE) - cleanup_exit(254); + cleanup_exit(255); fatal("%s: read: %s", __func__, strerror(errno)); } msg_len = PEEK_U32(buf); Index: src/crypto/external/bsd/openssh/dist/serverloop.c diff -u src/crypto/external/bsd/openssh/dist/serverloop.c:1.21 src/crypto/external/bsd/openssh/dist/serverloop.c:1.22 --- src/crypto/external/bsd/openssh/dist/serverloop.c:1.21 Sun Aug 26 03:46:36 2018 +++ src/crypto/external/bsd/openssh/dist/serverloop.c Sat Sep 29 11:10:44 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: serverloop.c,v 1.21 2018/08/26 07:46:36 christos Exp $ */ +/* $NetBSD: serverloop.c,v 1.22 2018/09/29 15:10:44 christos Exp $ */ /* $OpenBSD: serverloop.c,v 1.209 2018/07/27 05:13:02 dtucker Exp $ */ /* @@ -38,7 +38,7 @@ */ #include "includes.h" -__RCSID("$NetBSD: serverloop.c,v 1.21 2018/08/26 07:46:36 christos Exp $"); +__RCSID("$NetBSD: serverloop.c,v 1.22 2018/09/29 15:10:44 christos Exp $"); #include <sys/param.h> /* MIN MAX */ #include <sys/types.h> @@ -343,7 +343,7 @@ process_input(struct ssh *ssh, fd_set *r "%.100s port %d: %.100s", ssh_remote_ipaddr(ssh), ssh_remote_port(ssh), strerror(errno)); - cleanup_exit(254); + cleanup_exit(255); } } else { /* Buffer any received data. */ @@ -440,7 +440,7 @@ server_loop2(struct ssh *ssh, Authctxt * if (received_sigterm) { logit("Exiting on signal %d", (int)received_sigterm); /* Clean up sessions, utmp, etc. */ - cleanup_exit(254); + cleanup_exit(255); } collect_children(ssh); Index: src/crypto/external/bsd/openssh/dist/packet.c diff -u src/crypto/external/bsd/openssh/dist/packet.c:1.33 src/crypto/external/bsd/openssh/dist/packet.c:1.34 --- src/crypto/external/bsd/openssh/dist/packet.c:1.33 Sun Aug 26 03:46:36 2018 +++ src/crypto/external/bsd/openssh/dist/packet.c Sat Sep 29 11:10:44 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: packet.c,v 1.33 2018/08/26 07:46:36 christos Exp $ */ +/* $NetBSD: packet.c,v 1.34 2018/09/29 15:10:44 christos Exp $ */ /* $OpenBSD: packet.c,v 1.277 2018/07/16 03:09:13 djm Exp $ */ /* @@ -40,7 +40,7 @@ */ #include "includes.h" -__RCSID("$NetBSD: packet.c,v 1.33 2018/08/26 07:46:36 christos Exp $"); +__RCSID("$NetBSD: packet.c,v 1.34 2018/09/29 15:10:44 christos Exp $"); #include <sys/param.h> /* MIN roundup */ #include <sys/types.h> @@ -1883,7 +1883,7 @@ ssh_packet_disconnect(struct ssh *ssh, c /* Close the connection. */ ssh_packet_close(ssh); - cleanup_exit(254); + cleanup_exit(255); } /*