diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2017-12-10 05:55:29 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-12-12 10:32:04 +1100 |
| commit | 48c23a39a8f1069a57264dd826f6c90aa12778d5 (patch) | |
| tree | 5c2c1bbd5f66c821f7f62b65a53e0d2a9c325fd3 /serverloop.c | |
| parent | aabd75ec76575c1b17232e6526a644097cd798e5 (diff) | |
upstream commit
Put remote client info back into the ClientAlive
connection termination message. Based in part on diff from lars.nooden at
gmail, ok djm
OpenBSD-Commit-ID: 80a0f619a29bbf2f32eb5297a69978a0e05d0ee0
Diffstat (limited to 'serverloop.c')
| -rw-r--r-- | serverloop.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/serverloop.c b/serverloop.c index a3cb8e78..464c07d2 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.199 2017/10/23 05:08:00 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.200 2017/12/10 05:55:29 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -171,10 +171,12 @@ static void client_alive_check(struct ssh *ssh) { int channel_id; + char remote_id[512]; /* timeout, check to see how many we have had */ if (packet_inc_alive_timeouts() > options.client_alive_count_max) { - logit("Timeout, client not responding."); + sshpkt_fmt_connection_id(ssh, remote_id, sizeof(remote_id)); + logit("Timeout, client not responding from %s", remote_id); cleanup_exit(255); } |