diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2022-01-04 07:20:34 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2022-01-04 07:20:34 +0000 |
| commit | 4da9697250b252dd5e609186951877a65b87cf0b (patch) | |
| tree | 5e4a50c59b70b5619ef4cdf36305fb965f34e3b4 /regress/usr.bin | |
| parent | 3f762f7c1bddbc3e0e7e3300c171904e3081ef58 (diff) | |
unbreak test: was picking up system ssh-add instead of the one supposedly
being tested. Spotted by dtucker and using his VM zoo (which includes
some systems old enough to lack ed25519 key support)
Diffstat (limited to 'regress/usr.bin')
| -rw-r--r-- | regress/usr.bin/ssh/agent-restrict.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/usr.bin/ssh/agent-restrict.sh b/regress/usr.bin/ssh/agent-restrict.sh index 86128bf2127..0ddef3831d7 100644 --- a/regress/usr.bin/ssh/agent-restrict.sh +++ b/regress/usr.bin/ssh/agent-restrict.sh @@ -1,4 +1,4 @@ -# $OpenBSD: agent-restrict.sh,v 1.1 2021/12/19 22:20:12 djm Exp $ +# $OpenBSD: agent-restrict.sh,v 1.2 2022/01/04 07:20:33 djm Exp $ # Placed in the Public Domain. tid="agent restrictions" @@ -80,7 +80,7 @@ reset_keys() { _command="" case "$_whichcmd" in authinfo) _command="cat \$SSH_USER_AUTH" ;; - keylist) _command="ssh-add -L | cut -d' ' -f-2 | sort" ;; + keylist) _command="$SSHADD -L | cut -d' ' -f-2 | sort" ;; *) fatal "unsupported command $_whichcmd" ;; esac trace "reset keys" @@ -328,7 +328,7 @@ if test ! -z "\$me" ; then cat \$SSH_USER_AUTH fi echo AGENT -ssh-add -L | grep ^ssh | cut -d" " -f-2 | sort +$SSHADD -L | grep ^ssh | cut -d" " -f-2 | sort if test -z "\$next" ; then touch $OBJ/done echo "FINISH" |