summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-01-17 11:52:40 +1100
committerDamien Miller <djm@mindrot.org>2011-01-17 11:52:40 +1100
commit1ccbfa88b1defffa6cd4b533bcc97f737162afee (patch)
tree575f6f758bfd9934392fb6ad1c7f86638401d2e4
parentfd3669eb266086951f9181a3037a813b12eb6a94 (diff)
- (djm) [regress/agent-getpeereid.sh] leave stdout attached when running
ssh-add to avoid $SUDO failures on Linux
-rw-r--r--ChangeLog2
-rw-r--r--regress/agent-getpeereid.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 95b5b6bf..7dda03e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
roumenpetrov.info; ok dtucker@
- (djm) [regress/agent-ptrace.sh] Fix false failure on OS X by adding
its unique snowflake of a gdb error to the ones we look for.
+ - (djm) [regress/agent-getpeereid.sh] leave stdout attached when running
+ ssh-add to avoid $SUDO failures on Linux
20110116
- (dtucker) [Makefile.in configure.ac regress/kextype.sh] Skip sha256-based
diff --git a/regress/agent-getpeereid.sh b/regress/agent-getpeereid.sh
index 5d7f7329..22276a29 100644
--- a/regress/agent-getpeereid.sh
+++ b/regress/agent-getpeereid.sh
@@ -34,7 +34,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 2>/dev/null
r=$?
if [ $r -lt 2 ]; then
fail "ssh-add did not fail for ${UNPRIV}: $r < 2"