diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-01-21 09:06:27 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-01-21 09:08:37 +0100 |
| commit | f8c11461aa6db168fc5e7eeae448b4cbbf59642a (patch) | |
| tree | b648fa49d456d2a0f2285fe251800e8ed88bd74f /sshd.c | |
| parent | upstream: check access(ssh-sk-helper, X_OK) to provide friendly (diff) | |
| download | openssh-f8c11461aa6db168fc5e7eeae448b4cbbf59642a.tar.xz openssh-f8c11461aa6db168fc5e7eeae448b4cbbf59642a.zip | |
upstream: pass SSH_SK_HELPER explicitly past $SUDO to avoid it getting
cleared; with dtucker@
OpenBSD-Regress-ID: 03178a0580324bf0dff28f7eac6c3edbc5407f8e
Diffstat (limited to 'sshd.c')
| -rw-r--r-- | sshd.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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,11 @@ 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/%d startups", + startups, options.max_startups); + ostartups = startups; + } if (received_sighup) { if (!lameduck) { debug("Received SIGHUP; waiting for children"); |