diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | Makefile.in | 3 | ||||
-rw-r--r-- | regress/agent-getpeereid.sh | 2 |
3 files changed, 7 insertions, 4 deletions
@@ -9,7 +9,7 @@ | |||
9 | - [regress/reconfigure/sh] Make path to sshd fully qualified if required. | 9 | - [regress/reconfigure/sh] Make path to sshd fully qualified if required. |
10 | - [regress/rekey.sh] Remove dependence on /dev/zero (not all platforms have | 10 | - [regress/rekey.sh] Remove dependence on /dev/zero (not all platforms have |
11 | it). The sparse file will take less disk space too. | 11 | it). The sparse file will take less disk space too. |
12 | - [regress/sftp-cmds.sh] Ensure file used for test are readable. | 12 | - [regress/sftp-cmds.sh] Ensure files used for test are readable. |
13 | - [regress/stderr-after-eof.sh] Search for a usable checksum program. | 13 | - [regress/stderr-after-eof.sh] Search for a usable checksum program. |
14 | - [regress/sftp-badcmds.sh regress/sftp-cmds.sh regress/sftp.sh | 14 | - [regress/sftp-badcmds.sh regress/sftp-cmds.sh regress/sftp.sh |
15 | regress/ssh-com-client.sh regress/ssh-com-sftp.sh regress/stderr-data.sh | 15 | regress/ssh-com-client.sh regress/ssh-com-sftp.sh regress/stderr-data.sh |
@@ -25,6 +25,8 @@ | |||
25 | use Strictmodes no, wait longer for sshd startup. | 25 | use Strictmodes no, wait longer for sshd startup. |
26 | - [regress/Makefile] Remove BSDisms. | 26 | - [regress/Makefile] Remove BSDisms. |
27 | - [regress/README.regress] Add a basic readme. | 27 | - [regress/README.regress] Add a basic readme. |
28 | - [Makefile.in regress/agent-getpeereid.sh] config.h is now in $BUILDDIR | ||
29 | not $OBJ. | ||
28 | 30 | ||
29 | 20030903 | 31 | 20030903 |
30 | - (djm) OpenBSD CVS Sync | 32 | - (djm) OpenBSD CVS Sync |
@@ -1015,4 +1017,4 @@ | |||
1015 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1017 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1016 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1018 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1017 | 1019 | ||
1018 | $Id: ChangeLog,v 1.2958 2003/09/04 05:39:54 dtucker Exp $ | 1020 | $Id: ChangeLog,v 1.2959 2003/09/04 08:04:16 dtucker Exp $ |
diff --git a/Makefile.in b/Makefile.in index dfc510fae..2f8f04a10 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.243 2003/09/04 03:41:06 dtucker Exp $ | 1 | # $Id: Makefile.in,v 1.244 2003/09/04 08:04:16 dtucker Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -383,6 +383,7 @@ tests: $(TARGETS) | |||
383 | $(MAKE) \ | 383 | $(MAKE) \ |
384 | .OBJDIR="$${BUILDDIR}/regress" \ | 384 | .OBJDIR="$${BUILDDIR}/regress" \ |
385 | .CURDIR="`pwd`" \ | 385 | .CURDIR="`pwd`" \ |
386 | BUILDDIR="$${BUILDDIR}" \ | ||
386 | OBJ="$${BUILDDIR}/regress" \ | 387 | OBJ="$${BUILDDIR}/regress" \ |
387 | PATH="$${BUILDDIR}:$${PATH}" \ | 388 | PATH="$${BUILDDIR}:$${PATH}" \ |
388 | TEST_SSH_SSH="$${TEST_SSH_SSH}" \ | 389 | TEST_SSH_SSH="$${TEST_SSH_SSH}" \ |
diff --git a/regress/agent-getpeereid.sh b/regress/agent-getpeereid.sh index d1f48c81f..46d20dc2b 100644 --- a/regress/agent-getpeereid.sh +++ b/regress/agent-getpeereid.sh | |||
@@ -7,7 +7,7 @@ UNPRIV=nobody | |||
7 | ASOCK=${OBJ}/agent | 7 | ASOCK=${OBJ}/agent |
8 | SSH_AUTH_SOCK=/nonexistant | 8 | SSH_AUTH_SOCK=/nonexistant |
9 | 9 | ||
10 | if grep "#undef.*HAVE_GETPEEREID" ${OBJ}/config.h >/dev/null 2>&1 | 10 | if grep "#undef.*HAVE_GETPEEREID" ${BUILDDIR}/config.h >/dev/null 2>&1 |
11 | then | 11 | then |
12 | echo "skipped (not supported on this platform)" | 12 | echo "skipped (not supported on this platform)" |
13 | exit 0 | 13 | exit 0 |