From 1ccbfa88b1defffa6cd4b533bcc97f737162afee Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 17 Jan 2011 11:52:40 +1100
Subject: [PATCH]  - (djm) [regress/agent-getpeereid.sh] leave stdout attached
 when running    ssh-add to avoid $SUDO failures on Linux

---
 ChangeLog                   | 2 ++
 regress/agent-getpeereid.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 95b5b6bfd..7dda03e0e 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 5d7f73291..22276a29d 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"