summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--regress/integrity.sh4
-rw-r--r--regress/test-exec.sh7
-rw-r--r--sshd.c7
3 files changed, 12 insertions, 6 deletions
diff --git a/regress/integrity.sh b/regress/integrity.sh
index 5ba6bf6ab..bc030cb74 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: integrity.sh,v 1.23 2017/04/30 23:34:55 djm Exp $ 1# $OpenBSD: integrity.sh,v 1.24 2020/01/21 08:06:27 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="integrity" 4tid="integrity"
@@ -18,7 +18,7 @@ macs="$macs `${SSH} -Q cipher-auth`"
18# >> $OBJ/ssh_proxy 18# >> $OBJ/ssh_proxy
19 19
20# sshd-command for proxy (see test-exec.sh) 20# sshd-command for proxy (see test-exec.sh)
21cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy" 21cmd="$SUDO env SSH_SK_HELPER="$SSH_SK_HELPER" sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy"
22 22
23for m in $macs; do 23for m in $macs; do
24 trace "test $tid: mac $m" 24 trace "test $tid: mac $m"
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 03dab2031..b448192e1 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: test-exec.sh,v 1.69 2019/12/16 02:39:05 djm Exp $ 1# $OpenBSD: test-exec.sh,v 1.70 2020/01/21 08:06:27 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4#SUDO=sudo 4#SUDO=sudo
@@ -598,7 +598,7 @@ fi
598# create a proxy version of the client config 598# create a proxy version of the client config
599( 599(
600 cat $OBJ/ssh_config 600 cat $OBJ/ssh_config
601 echo proxycommand ${SUDO} sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy 601 echo proxycommand ${SUDO} env SSH_SK_HELPER=\"$SSH_SK_HELPER\" sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy
602) > $OBJ/ssh_proxy 602) > $OBJ/ssh_proxy
603 603
604# check proxy config 604# check proxy config
@@ -608,7 +608,8 @@ start_sshd ()
608{ 608{
609 # start sshd 609 # start sshd
610 $SUDO ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken" 610 $SUDO ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken"
611 $SUDO ${SSHD} -f $OBJ/sshd_config "$@" -E$TEST_SSHD_LOGFILE 611 $SUDO env SSH_SK_HELPER="$SSH_SK_HELPER" \
612 ${SSHD} -f $OBJ/sshd_config "$@" -E$TEST_SSHD_LOGFILE
612 613
613 trace "wait for sshd" 614 trace "wait for sshd"
614 i=0; 615 i=0;
diff --git a/sshd.c b/sshd.c
index 0cf13a741..ecec026bf 100644
--- a/sshd.c
+++ b/sshd.c
@@ -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");