diff options
author | Damien Miller <djm@cvs.openbsd.org> | 2021-06-08 22:30:28 +0000 |
---|---|---|
committer | Damien Miller <djm@cvs.openbsd.org> | 2021-06-08 22:30:28 +0000 |
commit | 15a4c51f35d3e687d69fd31d481ea1ca59f7994c (patch) | |
tree | 55886dab7d9abdba285d10d948e72f0b9dd16278 | |
parent | 487633c83f05d120860817573320b8607c42c3b5 (diff) |
test that UserKnownHostsFile correctly accepts multiple arguments;
would have caught readconf.c r1.356 regression
-rw-r--r-- | regress/usr.bin/ssh/cert-hostkey.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/regress/usr.bin/ssh/cert-hostkey.sh b/regress/usr.bin/ssh/cert-hostkey.sh index ebf6c903925..de8652b0e5e 100644 --- a/regress/usr.bin/ssh/cert-hostkey.sh +++ b/regress/usr.bin/ssh/cert-hostkey.sh @@ -1,4 +1,4 @@ -# $OpenBSD: cert-hostkey.sh,v 1.24 2021/02/25 03:27:34 djm Exp $ +# $OpenBSD: cert-hostkey.sh,v 1.25 2021/06/08 22:30:27 djm Exp $ # Placed in the Public Domain. tid="certified host keys" @@ -283,11 +283,17 @@ for ktype in $PLAIN_TYPES ; do ) > $OBJ/sshd_proxy ${SSH} -oUserKnownHostsFile=$OBJ/known_hosts-cert \ - -oGlobalKnownHostsFile=$OBJ/known_hosts-cert \ - -F $OBJ/ssh_proxy somehost true + -oGlobalKnownHostsFile=none -F $OBJ/ssh_proxy somehost true if [ $? -ne 0 ]; then fail "ssh cert connect failed" fi + # Also check that it works when the known_hosts file is not in the + # first array position. + ${SSH} -oUserKnownHostsFile="/dev/null $OBJ/known_hosts-cert" \ + -oGlobalKnownHostsFile=none -F $OBJ/ssh_proxy somehost true + if [ $? -ne 0 ]; then + fail "ssh cert connect failed known_hosts 2nd" + fi done # Wrong certificate |