summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--regress/agent-getpeereid.sh4
-rw-r--r--regress/agent.sh4
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d82f351f..2b34a056d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
3 - dtucker@cvs.openbsd.org 2007/10/29 06:57:13 3 - dtucker@cvs.openbsd.org 2007/10/29 06:57:13
4 [regress/Makefile regress/localcommand.sh] 4 [regress/Makefile regress/localcommand.sh]
5 Add simple regress test for LocalCommand; ok djm@ 5 Add simple regress test for LocalCommand; ok djm@
6 - jmc@cvs.openbsd.org 2007/11/25 15:35:09
7 [regress/agent-getpeereid.sh regress/agent.sh]
8 more existant -> existent, from Martynas Venckus;
9 pfctl changes: ok henning
10 ssh changes: ok deraadt
6 11
720080311 1220080311
8 - (dtucker) [auth-pam.c monitor.c session.c sshd.c] Bug #926: Move 13 - (dtucker) [auth-pam.c monitor.c session.c sshd.c] Bug #926: Move
@@ -3724,4 +3729,4 @@
3724 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3729 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3725 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3730 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3726 3731
3727$Id: ChangeLog,v 1.4867 2008/03/12 12:58:05 djm Exp $ 3732$Id: ChangeLog,v 1.4868 2008/03/12 12:58:55 djm Exp $
diff --git a/regress/agent-getpeereid.sh b/regress/agent-getpeereid.sh
index d71324241..5d7f73291 100644
--- a/regress/agent-getpeereid.sh
+++ b/regress/agent-getpeereid.sh
@@ -1,11 +1,11 @@
1# $OpenBSD: agent-getpeereid.sh,v 1.3 2006/07/06 12:01:53 grunk Exp $ 1# $OpenBSD: agent-getpeereid.sh,v 1.4 2007/11/25 15:35:09 jmc Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="disallow agent attach from other uid" 4tid="disallow agent attach from other uid"
5 5
6UNPRIV=nobody 6UNPRIV=nobody
7ASOCK=${OBJ}/agent 7ASOCK=${OBJ}/agent
8SSH_AUTH_SOCK=/nonexistant 8SSH_AUTH_SOCK=/nonexistent
9 9
10if grep "#undef.*HAVE_GETPEEREID" ${BUILDDIR}/config.h >/dev/null 2>&1 && \ 10if grep "#undef.*HAVE_GETPEEREID" ${BUILDDIR}/config.h >/dev/null 2>&1 && \
11 grep "#undef.*HAVE_GETPEERUCRED" ${BUILDDIR}/config.h >/dev/null && \ 11 grep "#undef.*HAVE_GETPEERUCRED" ${BUILDDIR}/config.h >/dev/null && \
diff --git a/regress/agent.sh b/regress/agent.sh
index b34487767..094cf694b 100644
--- a/regress/agent.sh
+++ b/regress/agent.sh
@@ -1,9 +1,9 @@
1# $OpenBSD: agent.sh,v 1.6 2002/03/15 13:08:56 markus Exp $ 1# $OpenBSD: agent.sh,v 1.7 2007/11/25 15:35:09 jmc Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="simple agent test" 4tid="simple agent test"
5 5
6SSH_AUTH_SOCK=/nonexistant ${SSHADD} -l > /dev/null 2>&1 6SSH_AUTH_SOCK=/nonexistent ${SSHADD} -l > /dev/null 2>&1
7if [ $? -ne 2 ]; then 7if [ $? -ne 2 ]; then
8 fail "ssh-add -l did not fail with exit code 2" 8 fail "ssh-add -l did not fail with exit code 2"
9fi 9fi