diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-01-21 08:06:27 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-01-21 19:08:37 +1100 |
commit | f8c11461aa6db168fc5e7eeae448b4cbbf59642a (patch) | |
tree | b648fa49d456d2a0f2285fe251800e8ed88bd74f /sshd.c | |
parent | b5fcb0ac1cc0ef01aeec1c089146298654ab3ae0 (diff) |
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) | |||
1059 | { | 1059 | { |
1060 | fd_set *fdset; | 1060 | fd_set *fdset; |
1061 | int i, j, ret, maxfd; | 1061 | int i, j, ret, maxfd; |
1062 | int startups = 0, listening = 0, lameduck = 0; | 1062 | int ostartups = -1, startups = 0, listening = 0, lameduck = 0; |
1063 | int startup_p[2] = { -1 , -1 }; | 1063 | int startup_p[2] = { -1 , -1 }; |
1064 | char c = 0; | 1064 | char c = 0; |
1065 | struct sockaddr_storage from; | 1065 | struct sockaddr_storage from; |
@@ -1084,6 +1084,11 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s) | |||
1084 | * the daemon is killed with a signal. | 1084 | * the daemon is killed with a signal. |
1085 | */ | 1085 | */ |
1086 | for (;;) { | 1086 | for (;;) { |
1087 | if (ostartups != startups) { | ||
1088 | setproctitle("[listener] %d/%d startups", | ||
1089 | startups, options.max_startups); | ||
1090 | ostartups = startups; | ||
1091 | } | ||
1087 | if (received_sighup) { | 1092 | if (received_sighup) { |
1088 | if (!lameduck) { | 1093 | if (!lameduck) { |
1089 | debug("Received SIGHUP; waiting for children"); | 1094 | debug("Received SIGHUP; waiting for children"); |