[src/trunk]: src/crypto/external/bsd/openssh/dist Undo previous change. It ma...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/758785fa962f
branches:  trunk
changeset: 433762:758785fa962f
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Oct 02 22:40:28 2018 +0000

description:
Undo previous change. It made filtering a lot more aggressive.

diffstat:

 crypto/external/bsd/openssh/dist/monitor_wrap.c |  6 +++---
 crypto/external/bsd/openssh/dist/packet.c       |  6 +++---
 crypto/external/bsd/openssh/dist/serverloop.c   |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (90 lines):

diff -r 022ffdd67a5e -r 758785fa962f crypto/external/bsd/openssh/dist/monitor_wrap.c
--- a/crypto/external/bsd/openssh/dist/monitor_wrap.c   Tue Oct 02 18:49:24 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/monitor_wrap.c   Tue Oct 02 22:40:28 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: monitor_wrap.c,v 1.22 2018/09/29 15:10:44 christos Exp $       */
+/*     $NetBSD: monitor_wrap.c,v 1.23 2018/10/02 22:40:28 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.22 2018/09/29 15:10:44 christos Exp $");
+__RCSID("$NetBSD: monitor_wrap.c,v 1.23 2018/10/02 22:40:28 christos Exp $");
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/queue.h>
@@ -151,7 +151,7 @@
 
        if (atomicio(read, sock, buf, sizeof(buf)) != sizeof(buf)) {
                if (errno == EPIPE)
-                       cleanup_exit(255);
+                       cleanup_exit(254);
                fatal("%s: read: %s", __func__, strerror(errno));
        }
        msg_len = PEEK_U32(buf);
diff -r 022ffdd67a5e -r 758785fa962f crypto/external/bsd/openssh/dist/packet.c
--- a/crypto/external/bsd/openssh/dist/packet.c Tue Oct 02 18:49:24 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/packet.c Tue Oct 02 22:40:28 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: packet.c,v 1.34 2018/09/29 15:10:44 christos Exp $     */
+/*     $NetBSD: packet.c,v 1.35 2018/10/02 22:40:28 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.34 2018/09/29 15:10:44 christos Exp $");
+__RCSID("$NetBSD: packet.c,v 1.35 2018/10/02 22:40:28 christos Exp $");
 
 #include <sys/param.h> /* MIN roundup */
 #include <sys/types.h>
@@ -1883,7 +1883,7 @@
 
        /* Close the connection. */
        ssh_packet_close(ssh);
-       cleanup_exit(255);
+       cleanup_exit(254);
 }
 
 /*
diff -r 022ffdd67a5e -r 758785fa962f crypto/external/bsd/openssh/dist/serverloop.c
--- a/crypto/external/bsd/openssh/dist/serverloop.c     Tue Oct 02 18:49:24 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/serverloop.c     Tue Oct 02 22:40:28 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: serverloop.c,v 1.22 2018/09/29 15:10:44 christos Exp $ */
+/*     $NetBSD: serverloop.c,v 1.23 2018/10/02 22:40:28 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.22 2018/09/29 15:10:44 christos Exp $");
+__RCSID("$NetBSD: serverloop.c,v 1.23 2018/10/02 22:40:28 christos Exp $");
 
 #include <sys/param.h> /* MIN MAX */
 #include <sys/types.h>
@@ -343,7 +343,7 @@
                                    "%.100s port %d: %.100s",
                                    ssh_remote_ipaddr(ssh),
                                    ssh_remote_port(ssh), strerror(errno));
-                               cleanup_exit(255);
+                               cleanup_exit(254);
                        }
                } else {
                        /* Buffer any received data. */
@@ -440,7 +440,7 @@
                if (received_sigterm) {
                        logit("Exiting on signal %d", (int)received_sigterm);
                        /* Clean up sessions, utmp, etc. */
-                       cleanup_exit(255);
+                       cleanup_exit(254);
                }
 
                collect_children(ssh);