diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2017-01-06 02:51:17 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2017-01-06 02:51:17 +0000 |
| commit | 2ee29bd849c7fecf23060b34c4144303a331ac15 (patch) | |
| tree | 8e689681f6c4989544db5fd04010145def96bafc /regress/usr.bin | |
| parent | a3070a08aa2302127c08477216a5b93d7e62d1b9 (diff) | |
use correct ssh-add program; bz#2654, from Colin Watson
Diffstat (limited to 'regress/usr.bin')
| -rw-r--r-- | regress/usr.bin/ssh/agent-getpeereid.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/regress/usr.bin/ssh/agent-getpeereid.sh b/regress/usr.bin/ssh/agent-getpeereid.sh index f668dcfc438..0c1f24453be 100644 --- a/regress/usr.bin/ssh/agent-getpeereid.sh +++ b/regress/usr.bin/ssh/agent-getpeereid.sh @@ -1,4 +1,4 @@ -# $OpenBSD: agent-getpeereid.sh,v 1.7 2016/09/26 21:34:38 bluhm Exp $ +# $OpenBSD: agent-getpeereid.sh,v 1.8 2017/01/06 02:51:16 djm Exp $ # Placed in the Public Domain. tid="disallow agent attach from other uid" @@ -31,17 +31,17 @@ if [ $r -ne 0 ]; then else chmod 644 ${SSH_AUTH_SOCK} - ssh-add -l > /dev/null 2>&1 + ${SSHADD} -l > /dev/null 2>&1 r=$? if [ $r -ne 1 ]; then fail "ssh-add failed with $r != 1" fi if test -z "$sudo" ; then # doas - ${SUDO} -n -u ${UNPRIV} ssh-add -l 2>/dev/null + ${SUDO} -n -u ${UNPRIV} ${SSHADD} -l 2>/dev/null else # sudo - < /dev/null ${SUDO} -S -u ${UNPRIV} ssh-add -l 2>/dev/null + < /dev/null ${SUDO} -S -u ${UNPRIV} ${SSHADD} -l 2>/dev/null fi r=$? if [ $r -lt 2 ]; then |