tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

Move the "stop sshd" code into its own helper function.
Patch from Zev Weiss <zev at bewilderbeest.net>, ok djm@

Upstream-Regress-ID: a113dea77df5bd97fb4633ea31f3d72dbe356329
This commit is contained in:
dtucker@openbsd.org 2016-12-16 01:06:27 +00:00 committed by Damien Miller
parent e15e715233
commit 2f2ffa4fbe
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
regress/login-timeout.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: login-timeout.sh,v 1.7 2014/03/13 20:44:49 djm Exp $ # $OpenBSD: login-timeout.sh,v 1.8 2016/12/16 01:06:27 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="connect after login grace timeout" tid="connect after login grace timeout"
@ -17,7 +17,7 @@ if [ $? -ne 0 ]; then
fail "ssh connect after login grace timeout failed with privsep" fail "ssh connect after login grace timeout failed with privsep"
fi fi
$SUDO kill `$SUDO cat $PIDFILE` stop_sshd
trace "test login grace without privsep" trace "test login grace without privsep"
echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config

11
regress/reexec.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: reexec.sh,v 1.9 2016/12/15 23:50:37 dtucker Exp $ # $OpenBSD: reexec.sh,v 1.10 2016/12/16 01:06:27 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="reexec tests" tid="reexec tests"
@ -39,8 +39,7 @@ echo "InvalidXXX=no" >> $OBJ/sshd_config
copy_tests copy_tests
$SUDO kill `$SUDO cat $PIDFILE` stop_sshd
rm -f $PIDFILE
cp $OBJ/sshd_config.orig $OBJ/sshd_config cp $OBJ/sshd_config.orig $OBJ/sshd_config
@ -54,8 +53,7 @@ rm -f $SSHD_COPY
copy_tests copy_tests
$SUDO kill `$SUDO cat $PIDFILE` stop_sshd
rm -f $PIDFILE
verbose "test reexec fallback without privsep" verbose "test reexec fallback without privsep"
@ -67,7 +65,6 @@ rm -f $SSHD_COPY
copy_tests copy_tests
$SUDO kill `$SUDO cat $PIDFILE` stop_sshd
rm -f $PIDFILE
fi fi

25
regress/test-exec.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: test-exec.sh,v 1.57 2016/11/25 03:02:01 dtucker Exp $ # $OpenBSD: test-exec.sh,v 1.58 2016/12/16 01:06:27 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
#SUDO=sudo #SUDO=sudo
@ -293,16 +293,8 @@ md5 () {
} }
# End of portable specific functions # End of portable specific functions
# helper stop_sshd ()
cleanup ()
{ {
if [ "x$SSH_PID" != "x" ]; then
if [ $SSH_PID -lt 2 ]; then
echo bad pid for ssh: $SSH_PID
else
kill $SSH_PID
fi
fi
if [ -f $PIDFILE ]; then if [ -f $PIDFILE ]; then
pid=`$SUDO cat $PIDFILE` pid=`$SUDO cat $PIDFILE`
if [ "X$pid" = "X" ]; then if [ "X$pid" = "X" ]; then
@ -325,6 +317,19 @@ cleanup ()
fi fi
} }
# helper
cleanup ()
{
if [ "x$SSH_PID" != "x" ]; then
if [ $SSH_PID -lt 2 ]; then
echo bad pid for ssh: $SSH_PID
else
kill $SSH_PID
fi
fi
stop_sshd
}
start_debug_log () start_debug_log ()
{ {
echo "trace: $@" >$TEST_REGRESS_LOGFILE echo "trace: $@" >$TEST_REGRESS_LOGFILE