diff options
author | 2017-12-10 05:55:29 +0000 | |
---|---|---|
committer | 2017-12-10 05:55:29 +0000 | |
commit | 85740555605ab6461f35b2c6028f01aaeaa7e99f (patch) | |
tree | 9fe1ecc69165eca156f1f70fb6c231376ed85a61 /usr.bin/ssh/serverloop.c | |
parent | Enable the phy-supply regulator if present and use the phy id specified (diff) | |
download | wireguard-openbsd-85740555605ab6461f35b2c6028f01aaeaa7e99f.tar.xz wireguard-openbsd-85740555605ab6461f35b2c6028f01aaeaa7e99f.zip |
Put remote client info back into the ClientAlive connection termination
message. Based in part on diff from lars.nooden at gmail, ok djm
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
-rw-r--r-- | usr.bin/ssh/serverloop.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 955656ec81e..309a2567fc2 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/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 @@ -165,10 +165,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); } |