upstream commit

don't reset  to the installed sshd; connect before
 reconfigure, too
This commit is contained in:
markus@openbsd.org 2015-01-14 09:54:38 +00:00 committed by Damien Miller
parent 771bb47a1d
commit 6c43b48b30

View File

@ -1,4 +1,4 @@
# $OpenBSD: reconfigure.sh,v 1.2 2003/06/21 09:14:05 markus Exp $
# $OpenBSD: reconfigure.sh,v 1.3 2015/01/14 09:54:38 markus Exp $
# Placed in the Public Domain.
tid="simple connect after reconfigure"
@ -15,6 +15,14 @@ esac
start_sshd
trace "connect before restart"
for p in 1 2; do
${SSH} -o "Protocol=$p" -F $OBJ/ssh_config somehost true
if [ $? -ne 0 ]; then
fail "ssh connect with protocol $p failed before reconfigure"
fi
done
PID=`$SUDO cat $PIDFILE`
rm -f $PIDFILE
$SUDO kill -HUP $PID
@ -28,6 +36,7 @@ done
test -f $PIDFILE || fatal "sshd did not restart"
trace "connect after restart"
for p in 1 2; do
${SSH} -o "Protocol=$p" -F $OBJ/ssh_config somehost true
if [ $? -ne 0 ]; then