Module Name: src
Committed By: christos
Date: Thu Aug 9 08:32:41 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh/dist: monitor_wrap.c mux.c packet.c
serverloop.c session.c
Log Message:
change some 255's to 254's to avoid being too aggressive blacklisting.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
src/crypto/external/bsd/openssh/dist/mux.c \
src/crypto/external/bsd/openssh/dist/serverloop.c
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/session.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.19 src/crypto/external/bsd/openssh/dist/monitor_wrap.c:1.20
--- src/crypto/external/bsd/openssh/dist/monitor_wrap.c:1.19 Fri Apr 6 14:59:00 2018
+++ src/crypto/external/bsd/openssh/dist/monitor_wrap.c Thu Aug 9 04:32:41 2018
@@ -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 <[email protected]>
@@ -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 @@ mm_request_receive(int sock, Buffer *m)
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);
Index: src/crypto/external/bsd/openssh/dist/mux.c
diff -u src/crypto/external/bsd/openssh/dist/mux.c:1.19 src/crypto/external/bsd/openssh/dist/mux.c:1.20
--- src/crypto/external/bsd/openssh/dist/mux.c:1.19 Sat Oct 7 15:39:19 2017
+++ src/crypto/external/bsd/openssh/dist/mux.c Thu Aug 9 04:32:41 2018
@@ -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 <[email protected]>
@@ -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 @@ muxserver_listen(struct ssh *ssh)
return;
} else {
/* unix_listener() logs the error */
- cleanup_exit(255);
+ cleanup_exit(254);
}
}
Index: src/crypto/external/bsd/openssh/dist/serverloop.c
diff -u src/crypto/external/bsd/openssh/dist/serverloop.c:1.19 src/crypto/external/bsd/openssh/dist/serverloop.c:1.20
--- src/crypto/external/bsd/openssh/dist/serverloop.c:1.19 Fri Apr 6 14:59:00 2018
+++ src/crypto/external/bsd/openssh/dist/serverloop.c Thu Aug 9 04:32:41 2018
@@ -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 <[email protected]>
@@ -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 @@ process_input(struct ssh *ssh, fd_set *r
"%.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 @@ server_loop2(struct ssh *ssh, Authctxt *
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);
Index: src/crypto/external/bsd/openssh/dist/packet.c
diff -u src/crypto/external/bsd/openssh/dist/packet.c:1.31 src/crypto/external/bsd/openssh/dist/packet.c:1.32
--- src/crypto/external/bsd/openssh/dist/packet.c:1.31 Fri Apr 6 14:59:00 2018
+++ src/crypto/external/bsd/openssh/dist/packet.c Thu Aug 9 04:32:41 2018
@@ -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 <[email protected]>
@@ -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 @@ ssh_packet_disconnect(struct ssh *ssh, c
/* Close the connection. */
ssh_packet_close(ssh);
- cleanup_exit(255);
+ cleanup_exit(254);
}
/*
Index: src/crypto/external/bsd/openssh/dist/session.c
diff -u src/crypto/external/bsd/openssh/dist/session.c:1.24 src/crypto/external/bsd/openssh/dist/session.c:1.25
--- src/crypto/external/bsd/openssh/dist/session.c:1.24 Fri Apr 6 14:59:00 2018
+++ src/crypto/external/bsd/openssh/dist/session.c Thu Aug 9 04:32:41 2018
@@ -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 <[email protected]>, 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 @@ do_login(struct ssh *ssh, Session *s, co
if (getpeername(packet_get_connection_in(),
(struct sockaddr *)&from, &fromlen) < 0) {
debug("getpeername: %.100s", strerror(errno));
- cleanup_exit(255);
+ cleanup_exit(254);
}
}
