RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: 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)

OpenBSD-Regress-ID: 7976eb3df11cc2ca3af91030a6a8c0cef1590bb5
This commit is contained in:
djm@openbsd.org 2022-01-04 07:20:33 +00:00 committed by Damien Miller
parent a23698c308
commit c672f83a89
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
regress/agent-restrict.sh
View File

@ -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. # Placed in the Public Domain.
tid="agent restrictions" tid="agent restrictions"
@ -80,7 +80,7 @@ reset_keys() {
_command="" _command=""
case "$_whichcmd" in case "$_whichcmd" in
authinfo) _command="cat \$SSH_USER_AUTH" ;; 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" ;; *) fatal "unsupported command $_whichcmd" ;;
esac esac
trace "reset keys" trace "reset keys"
@ -328,7 +328,7 @@ if test ! -z "\$me" ; then
cat \$SSH_USER_AUTH cat \$SSH_USER_AUTH
fi fi
echo AGENT 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 if test -z "\$next" ; then
touch $OBJ/done touch $OBJ/done
echo "FINISH" echo "FINISH"