diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | regress/agent-getpeereid.sh | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -52,6 +52,10 @@ | |||
52 | - markus@cvs.openbsd.org 2005/06/30 11:02:37 | 52 | - markus@cvs.openbsd.org 2005/06/30 11:02:37 |
53 | [regress/scp.sh] | 53 | [regress/scp.sh] |
54 | allow SUDO=sudo; from Alexander Bluhm | 54 | allow SUDO=sudo; from Alexander Bluhm |
55 | - grunk@cvs.openbsd.org 2005/11/14 21:25:56 | ||
56 | [regress/agent-getpeereid.sh] | ||
57 | all other scripts in this dir use $SUDO, not 'sudo', so pull this even | ||
58 | ok markus@ | ||
55 | 59 | ||
56 | 20060129 | 60 | 20060129 |
57 | - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the | 61 | - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the |
@@ -3777,4 +3781,4 @@ | |||
3777 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3781 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3778 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3782 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3779 | 3783 | ||
3780 | $Id: ChangeLog,v 1.4106 2006/01/31 11:01:42 djm Exp $ | 3784 | $Id: ChangeLog,v 1.4107 2006/01/31 11:02:16 djm Exp $ |
diff --git a/regress/agent-getpeereid.sh b/regress/agent-getpeereid.sh index 46d20dc2b..6186a8d48 100644 --- a/regress/agent-getpeereid.sh +++ b/regress/agent-getpeereid.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: agent-getpeereid.sh,v 1.1 2002/12/09 16:05:02 markus Exp $ | 1 | # $OpenBSD: agent-getpeereid.sh,v 1.2 2005/11/14 21:25:56 grunk Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="disallow agent attach from other uid" | 4 | tid="disallow agent attach from other uid" |
@@ -27,7 +27,7 @@ else | |||
27 | fail "ssh-add failed with $r != 1" | 27 | fail "ssh-add failed with $r != 1" |
28 | fi | 28 | fi |
29 | 29 | ||
30 | < /dev/null sudo -S -u ${UNPRIV} ssh-add -l > /dev/null 2>&1 | 30 | < /dev/null ${SUDO} -S -u ${UNPRIV} ssh-add -l > /dev/null 2>&1 |
31 | r=$? | 31 | r=$? |
32 | if [ $r -lt 2 ]; then | 32 | if [ $r -lt 2 ]; then |
33 | fail "ssh-add did not fail for ${UNPRIV}: $r < 2" | 33 | fail "ssh-add did not fail for ${UNPRIV}: $r < 2" |