diff options
author | Damien Miller <djm@mindrot.org> | 2011-01-17 11:52:40 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-01-17 11:52:40 +1100 |
commit | 1ccbfa88b1defffa6cd4b533bcc97f737162afee (patch) | |
tree | 575f6f758bfd9934392fb6ad1c7f86638401d2e4 | |
parent | fd3669eb266086951f9181a3037a813b12eb6a94 (diff) |
- (djm) [regress/agent-getpeereid.sh] leave stdout attached when running
ssh-add to avoid $SUDO failures on Linux
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | regress/agent-getpeereid.sh | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -4,6 +4,8 @@ | |||
4 | roumenpetrov.info; ok dtucker@ | 4 | roumenpetrov.info; ok dtucker@ |
5 | - (djm) [regress/agent-ptrace.sh] Fix false failure on OS X by adding | 5 | - (djm) [regress/agent-ptrace.sh] Fix false failure on OS X by adding |
6 | its unique snowflake of a gdb error to the ones we look for. | 6 | its unique snowflake of a gdb error to the ones we look for. |
7 | - (djm) [regress/agent-getpeereid.sh] leave stdout attached when running | ||
8 | ssh-add to avoid $SUDO failures on Linux | ||
7 | 9 | ||
8 | 20110116 | 10 | 20110116 |
9 | - (dtucker) [Makefile.in configure.ac regress/kextype.sh] Skip sha256-based | 11 | - (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 | |||
34 | fail "ssh-add failed with $r != 1" | 34 | fail "ssh-add failed with $r != 1" |
35 | fi | 35 | fi |
36 | 36 | ||
37 | < /dev/null ${SUDO} -S -u ${UNPRIV} ssh-add -l > /dev/null 2>&1 | 37 | < /dev/null ${SUDO} -S -u ${UNPRIV} ssh-add -l 2>/dev/null |
38 | r=$? | 38 | r=$? |
39 | if [ $r -lt 2 ]; then | 39 | if [ $r -lt 2 ]; then |
40 | fail "ssh-add did not fail for ${UNPRIV}: $r < 2" | 40 | fail "ssh-add did not fail for ${UNPRIV}: $r < 2" |