diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-01-21 22:39:57 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-01-22 09:41:47 +1100 |
| commit | 70d38c3cfd4550e8ee66cc3bf1b91aa339c91df5 (patch) | |
| tree | 1f58cb4a0122654955d8a5533167ca0b52e82293 | |
| parent | a78c66d5d2144bd49779bc80a647346bd3d7233d (diff) | |
| download | openssh-git-70d38c3cfd4550e8ee66cc3bf1b91aa339c91df5.tar.gz | |
upstream: expose the number of currently-authenticating connections
along with the MaxStartups limit in the proctitle; suggestion from Philipp
Marek, w/ feedback from Craig Miskell ok dtucker@
OpenBSD-Commit-ID: a4a6db2dc1641a5df8eddf7d6652176e359dffb3
| -rw-r--r-- | sshd.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.542 2019/12/15 18:57:30 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.543 2020/01/21 22:39:57 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1059,7 +1059,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s) { fd_set *fdset; int i, j, ret, maxfd; - int startups = 0, listening = 0, lameduck = 0; + int ostartups = -1, startups = 0, listening = 0, lameduck = 0; int startup_p[2] = { -1 , -1 }; char c = 0; struct sockaddr_storage from; @@ -1084,6 +1084,12 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s) * the daemon is killed with a signal. */ for (;;) { + if (ostartups != startups) { + setproctitle("[listener] %d of %d-%d startups", + startups, options.max_startups_begin, + options.max_startups); + ostartups = startups; + } if (received_sighup) { if (!lameduck) { debug("Received SIGHUP; waiting for children"); |