diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-10-07 06:38:16 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-10-07 17:39:17 +1100 |
| commit | e8dfca9bfeff05de87160407fb3e6a5717fa3dcb (patch) | |
| tree | 1f6e986634d9d504185e49c189d22d524ca66f3b /regress/hostkey-rotate.sh | |
| parent | 4aa2717d7517cff4bc423a6cfba3a2defb055aea (diff) | |
| download | openssh-git-e8dfca9bfeff05de87160407fb3e6a5717fa3dcb.tar.gz | |
upstream: remove GlobalKnownHostsFile for this test after
UpdateHostkeys change
OpenBSD-Regress-ID: a940ad79d59343319613ba8fc46b6ef24aa3f8e1
Diffstat (limited to 'regress/hostkey-rotate.sh')
| -rw-r--r-- | regress/hostkey-rotate.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/regress/hostkey-rotate.sh b/regress/hostkey-rotate.sh index c3e100c3..2852c457 100644 --- a/regress/hostkey-rotate.sh +++ b/regress/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 |