summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-05-16 14:04:24 +0100
committerColin Watson <cjwatson@debian.org>2013-05-16 14:04:24 +0100
commit031d51614426a5d5ad42f971831df373f5d6e6d8 (patch)
tree6a66dc70fd3444ea8064f25256bd2fccdce6e3cd /packet.c
parent43587d4ea4349c7b98edcde117f37e6ca2e1b674 (diff)
parent328b60656f29db6306994d7498dede386ec2d1c3 (diff)
* New upstream release (http://www.openssh.com/txt/release-6.2p2):
- Only warn for missing identity files that were explicitly specified (closes: #708275). - Fix bug in contributed contrib/ssh-copy-id script that could result in "rm *" being called on mktemp failure (closes: #708419).
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/packet.c b/packet.c
index 9326ddea6..3e835d360 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.181 2013/02/10 23:35:24 djm Exp $ */ 1/* $OpenBSD: packet.c,v 1.182 2013/04/11 02:27:50 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1460,7 +1460,11 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
1460 case SSH2_MSG_DISCONNECT: 1460 case SSH2_MSG_DISCONNECT:
1461 reason = packet_get_int(); 1461 reason = packet_get_int();
1462 msg = packet_get_string(NULL); 1462 msg = packet_get_string(NULL);
1463 error("Received disconnect from %s: %u: %.400s", 1463 /* Ignore normal client exit notifications */
1464 do_log2(active_state->server_side &&
1465 reason == SSH2_DISCONNECT_BY_APPLICATION ?
1466 SYSLOG_LEVEL_INFO : SYSLOG_LEVEL_ERROR,
1467 "Received disconnect from %s: %u: %.400s",
1464 get_remote_ipaddr(), reason, msg); 1468 get_remote_ipaddr(), reason, msg);
1465 xfree(msg); 1469 xfree(msg);
1466 cleanup_exit(255); 1470 cleanup_exit(255);