summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2020-10-07 06:38:17 +0000
committerDamien Miller <djm@cvs.openbsd.org>2020-10-07 06:38:17 +0000
commita7242fd75318b2230f989b7be6181c221109f60a (patch)
tree8a61de06ce903bc577f9741182f75a0e4d96d589 /regress
parentd3e898f21328f6d60a5febc48aaf3edaf4837949 (diff)
remove GlobalKnownHostsFile for this test after UpdateHostkeys
change
Diffstat (limited to 'regress')
-rw-r--r--regress/usr.bin/ssh/hostkey-rotate.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/regress/usr.bin/ssh/hostkey-rotate.sh b/regress/usr.bin/ssh/hostkey-rotate.sh
index c3e100c3eb1..2852c457c25 100644
--- a/regress/usr.bin/ssh/hostkey-rotate.sh
+++ b/regress/usr.bin/ssh/hostkey-rotate.sh
@@ -1,12 +1,15 @@
-# $OpenBSD: hostkey-rotate.sh,v 1.8 2019/11/26 23:43:10 djm Exp $
+# $OpenBSD: hostkey-rotate.sh,v 1.9 2020/10/07 06:38:16 djm Exp $
# Placed in the Public Domain.
tid="hostkey rotate"
-rm -f $OBJ/hkr.* $OBJ/ssh_proxy.orig
+rm -f $OBJ/hkr.* $OBJ/ssh_proxy.orig $OBJ/ssh_proxy.orig
grep -vi 'hostkey' $OBJ/sshd_proxy > $OBJ/sshd_proxy.orig
+mv $OBJ/ssh_proxy $OBJ/ssh_proxy.orig
+grep -vi 'globalknownhostsfile' $OBJ/ssh_proxy.orig > $OBJ/ssh_proxy
echo "UpdateHostkeys=yes" >> $OBJ/ssh_proxy
+echo "GlobalKnownHostsFile=none" >> $OBJ/ssh_proxy
rm $OBJ/known_hosts
# The "primary" key type is ed25519 since it's supported even when built