tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/02/10 23:35:24

Browse Source 
[packet.c]
     record "Received disconnect" messages at ERROR rather than INFO priority,
     since they are abnormal and result in a non-zero ssh exit status; patch
     from Iain Morgan in bz#2057; ok dtucker@
This commit is contained in:
Damien Miller 2013-02-12 11:03:58 +11:00
parent 78d22713c7
commit 894926ebd8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -44,6 +44,11 @@
append to moduli file when screening candidates rather than overwriting. append to moduli file when screening candidates rather than overwriting.
allows resumption of interrupted screen; patch from Christophe Garault allows resumption of interrupted screen; patch from Christophe Garault
in bz#1957; ok dtucker@ in bz#1957; ok dtucker@
- djm@cvs.openbsd.org 2013/02/10 23:35:24
[packet.c]
record "Received disconnect" messages at ERROR rather than INFO priority,
since they are abnormal and result in a non-zero ssh exit status; patch
from Iain Morgan in bz#2057; ok dtucker@
20130211 20130211
- (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old

6
packet.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: packet.c,v 1.180 2013/01/08 18:49:04 markus Exp $ */ /* $OpenBSD: packet.c,v 1.181 2013/02/10 23:35:24 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1460,7 +1460,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
case SSH2_MSG_DISCONNECT: case SSH2_MSG_DISCONNECT:
reason = packet_get_int(); reason = packet_get_int();
msg = packet_get_string(NULL); msg = packet_get_string(NULL);
logit("Received disconnect from %s: %u: %.400s", error("Received disconnect from %s: %u: %.400s",
get_remote_ipaddr(), reason, msg); get_remote_ipaddr(), reason, msg);
xfree(msg); xfree(msg);
cleanup_exit(255); cleanup_exit(255);
@ -1485,7 +1485,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
break; break;
case SSH_MSG_DISCONNECT: case SSH_MSG_DISCONNECT:
msg = packet_get_string(NULL); msg = packet_get_string(NULL);
logit("Received disconnect from %s: %.400s", error("Received disconnect from %s: %.400s",
get_remote_ipaddr(), msg); get_remote_ipaddr(), msg);
cleanup_exit(255); cleanup_exit(255);
break; break;