upstream commit
don't reset to the installed sshd; connect before
reconfigure, too
diff --git a/regress/reconfigure.sh b/regress/reconfigure.sh
index 9fd2895..ba6648b 100644
--- a/regress/reconfigure.sh
+++ b/regress/reconfigure.sh
@@ -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 @@
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 @@
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