From 27a0dfaea9e4bcea6d434a5ea5363869dfe2f73a Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 31 Jan 2006 22:02:16 +1100 Subject: [PATCH] - grunk@cvs.openbsd.org 2005/11/14 21:25:56 [regress/agent-getpeereid.sh] all other scripts in this dir use $SUDO, not 'sudo', so pull this even ok markus@ --- ChangeLog | 6 +++++- regress/agent-getpeereid.sh | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea8ae91ae..b9e4e2a50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,10 @@ - markus@cvs.openbsd.org 2005/06/30 11:02:37 [regress/scp.sh] allow SUDO=sudo; from Alexander Bluhm + - grunk@cvs.openbsd.org 2005/11/14 21:25:56 + [regress/agent-getpeereid.sh] + all other scripts in this dir use $SUDO, not 'sudo', so pull this even + ok markus@ 20060129 - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the @@ -3777,4 +3781,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4106 2006/01/31 11:01:42 djm Exp $ +$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 @@ -# $OpenBSD: agent-getpeereid.sh,v 1.1 2002/12/09 16:05:02 markus Exp $ +# $OpenBSD: agent-getpeereid.sh,v 1.2 2005/11/14 21:25:56 grunk Exp $ # Placed in the Public Domain. tid="disallow agent attach from other uid" @@ -27,7 +27,7 @@ else fail "ssh-add failed with $r != 1" fi - < /dev/null sudo -S -u ${UNPRIV} ssh-add -l > /dev/null 2>&1 + < /dev/null ${SUDO} -S -u ${UNPRIV} ssh-add -l > /dev/null 2>&1 r=$? if [ $r -lt 2 ]; then fail "ssh-add did not fail for ${UNPRIV}: $r < 2"