From c672f83a89a756564db0d3af9934ba0e1cf8fa3e Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Tue, 4 Jan 2022 07:20:33 +0000 Subject: [PATCH] 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 --- regress/agent-restrict.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/regress/agent-restrict.sh b/regress/agent-restrict.sh index 86128bf21..0ddef3831 100644 --- a/regress/agent-restrict.sh +++ b/regress/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"