[src/trunk]: src/crypto/external/bsd/openssh/dist change some 255's to 254's ...

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

details:   https://anonhg.NetBSD.org/src/rev/ae1df363e880
branches:  trunk
changeset: 834331:ae1df363e880
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Aug 09 08:32:41 2018 +0000

description:
change some 255's to 254's to avoid being too aggressive blacklisting.

diffstat:

 crypto/external/bsd/openssh/dist/monitor_wrap.c |  6 +++---
 crypto/external/bsd/openssh/dist/mux.c          |  6 +++---
 crypto/external/bsd/openssh/dist/packet.c       |  6 +++---
 crypto/external/bsd/openssh/dist/serverloop.c   |  8 ++++----
 crypto/external/bsd/openssh/dist/session.c      |  6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diffs (144 lines):

diff -r 7f4984201731 -r ae1df363e880 crypto/external/bsd/openssh/dist/monitor_wrap.c
--- a/crypto/external/bsd/openssh/dist/monitor_wrap.c   Thu Aug 09 08:30:29 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/monitor_wrap.c   Thu Aug 09 08:32:41 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: monitor_wrap.c,v 1.19 2018/04/06 18:59:00 christos Exp $       */
+/*     $NetBSD: monitor_wrap.c,v 1.20 2018/08/09 08:32:41 christos Exp $       */
 /* $OpenBSD: monitor_wrap.c,v 1.99 2018/03/03 03:15:51 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos%citi.umich.edu@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: monitor_wrap.c,v 1.19 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: monitor_wrap.c,v 1.20 2018/08/09 08:32:41 christos Exp $");
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/queue.h>
@@ -149,7 +149,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 = get_u32(buf);
diff -r 7f4984201731 -r ae1df363e880 crypto/external/bsd/openssh/dist/mux.c
--- a/crypto/external/bsd/openssh/dist/mux.c    Thu Aug 09 08:30:29 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/mux.c    Thu Aug 09 08:32:41 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mux.c,v 1.19 2017/10/07 19:39:19 christos Exp $        */
+/*     $NetBSD: mux.c,v 1.20 2018/08/09 08:32:41 christos Exp $        */
 /* $OpenBSD: mux.c,v 1.69 2017/09/20 05:19:00 dtucker Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm%openbsd.org@localhost>
@@ -32,7 +32,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: mux.c,v 1.19 2017/10/07 19:39:19 christos Exp $");
+__RCSID("$NetBSD: mux.c,v 1.20 2018/08/09 08:32:41 christos Exp $");
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
@@ -1324,7 +1324,7 @@
                        return;
                } else {
                        /* unix_listener() logs the error */
-                       cleanup_exit(255);
+                       cleanup_exit(254);
                }
        }
 
diff -r 7f4984201731 -r ae1df363e880 crypto/external/bsd/openssh/dist/packet.c
--- a/crypto/external/bsd/openssh/dist/packet.c Thu Aug 09 08:30:29 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/packet.c Thu Aug 09 08:32:41 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: packet.c,v 1.31 2018/04/06 18:59:00 christos Exp $     */
+/*     $NetBSD: packet.c,v 1.32 2018/08/09 08:32:41 christos Exp $     */
 /* $OpenBSD: packet.c,v 1.269 2017/12/18 23:13:42 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: packet.c,v 1.31 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: packet.c,v 1.32 2018/08/09 08:32:41 christos Exp $");
 
 #include <sys/param.h> /* MIN roundup */
 #include <sys/types.h>
@@ -1898,7 +1898,7 @@
 
        /* Close the connection. */
        ssh_packet_close(ssh);
-       cleanup_exit(255);
+       cleanup_exit(254);
 }
 
 /*
diff -r 7f4984201731 -r ae1df363e880 crypto/external/bsd/openssh/dist/serverloop.c
--- a/crypto/external/bsd/openssh/dist/serverloop.c     Thu Aug 09 08:30:29 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/serverloop.c     Thu Aug 09 08:32:41 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: serverloop.c,v 1.19 2018/04/06 18:59:00 christos Exp $ */
+/*     $NetBSD: serverloop.c,v 1.20 2018/08/09 08:32:41 christos Exp $ */
 /* $OpenBSD: serverloop.c,v 1.205 2018/03/03 03:15:51 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: serverloop.c,v 1.19 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: serverloop.c,v 1.20 2018/08/09 08:32:41 christos Exp $");
 
 #include <sys/param.h> /* MIN MAX */
 #include <sys/types.h>
@@ -331,7 +331,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. */
@@ -428,7 +428,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);
diff -r 7f4984201731 -r ae1df363e880 crypto/external/bsd/openssh/dist/session.c
--- a/crypto/external/bsd/openssh/dist/session.c        Thu Aug 09 08:30:29 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/session.c        Thu Aug 09 08:32:41 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: session.c,v 1.24 2018/04/06 18:59:00 christos Exp $    */
+/*     $NetBSD: session.c,v 1.25 2018/08/09 08:32:41 christos Exp $    */
 /* $OpenBSD: session.c,v 1.294 2018/03/03 03:15:51 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: session.c,v 1.24 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: session.c,v 1.25 2018/08/09 08:32:41 christos Exp $");
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/un.h>
@@ -709,7 +709,7 @@
                if (getpeername(packet_get_connection_in(),
                    (struct sockaddr *)&from, &fromlen) < 0) {
                        debug("getpeername: %.100s", strerror(errno));
-                       cleanup_exit(255);
+                       cleanup_exit(254);
                }
        }