diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | Makefile.in | 3 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | regress/addrmatch.sh | 1 |
4 files changed, 17 insertions, 6 deletions
@@ -38,8 +38,10 @@ | |||
38 | - dtucker@cvs.openbsd.org 2008/06/10 15:28:49 | 38 | - dtucker@cvs.openbsd.org 2008/06/10 15:28:49 |
39 | [test-exec.sh] | 39 | [test-exec.sh] |
40 | Add quotes | 40 | Add quotes |
41 | - (dtucker) [openbsd-compat/fake-rfc2553.h] Add sin6_scope_id to sockaddr_in6 | 41 | - (dtucker) [openbsd-compat/fake-rfc2553.h] Add sin6_scope_id to sockaddr_in6 |
42 | since the new CIDR code in addmatch.c references it. | 42 | since the new CIDR code in addmatch.c references it. |
43 | - (dtucker) [Makefile.in configure.ac regress/addrmatch.sh] Skip IPv6 | ||
44 | specific tests on platforms that don't do IPv6. | ||
43 | 45 | ||
44 | 20080609 | 46 | 20080609 |
45 | - (dtucker) OpenBSD CVS Sync | 47 | - (dtucker) OpenBSD CVS Sync |
@@ -4126,4 +4128,4 @@ | |||
4126 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4128 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4127 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4129 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4128 | 4130 | ||
4129 | $Id: ChangeLog,v 1.4958 2008/06/10 15:39:38 dtucker Exp $ | 4131 | $Id: ChangeLog,v 1.4959 2008/06/10 18:15:05 dtucker Exp $ |
diff --git a/Makefile.in b/Makefile.in index 5debe2533..a2192eb5d 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.291 2008/06/10 12:59:10 dtucker Exp $ | 1 | # $Id: Makefile.in,v 1.292 2008/06/10 18:15:05 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@ |
@@ -394,6 +394,7 @@ tests interop-tests: $(TARGETS) | |||
394 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ | 394 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ |
395 | TEST_SSH_PLINK="plink"; \ | 395 | TEST_SSH_PLINK="plink"; \ |
396 | TEST_SSH_PUTTYGEN="puttygen"; \ | 396 | TEST_SSH_PUTTYGEN="puttygen"; \ |
397 | TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ | ||
397 | cd $(srcdir)/regress || exit $$?; \ | 398 | cd $(srcdir)/regress || exit $$?; \ |
398 | $(MAKE) \ | 399 | $(MAKE) \ |
399 | .OBJDIR="$${BUILDDIR}/regress" \ | 400 | .OBJDIR="$${BUILDDIR}/regress" \ |
diff --git a/configure.ac b/configure.ac index 9f39b2333..130ef6bc0 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.402 2008/06/08 20:17:53 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.403 2008/06/10 18:15:05 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.402 $) | 18 | AC_REVISION($Revision: 1.403 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -4068,6 +4068,13 @@ dnl Adding -Werror to CFLAGS early prevents configure tests from running. | |||
4068 | dnl Add now. | 4068 | dnl Add now. |
4069 | CFLAGS="$CFLAGS $werror_flags" | 4069 | CFLAGS="$CFLAGS $werror_flags" |
4070 | 4070 | ||
4071 | if grep "#define BROKEN_GETADDRINFO 1" confdefs.h >/dev/null || \ | ||
4072 | test "x$ac_cv_func_getaddrinfo" != "xyes" ; then | ||
4073 | AC_SUBST(TEST_SSH_IPV6, no) | ||
4074 | else | ||
4075 | AC_SUBST(TEST_SSH_IPV6, yes) | ||
4076 | fi | ||
4077 | |||
4071 | AC_EXEEXT | 4078 | AC_EXEEXT |
4072 | AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \ | 4079 | AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \ |
4073 | openbsd-compat/Makefile openbsd-compat/regress/Makefile \ | 4080 | openbsd-compat/Makefile openbsd-compat/regress/Makefile \ |
diff --git a/regress/addrmatch.sh b/regress/addrmatch.sh index a05df1539..a258f7bb4 100644 --- a/regress/addrmatch.sh +++ b/regress/addrmatch.sh | |||
@@ -33,6 +33,7 @@ run_trial user 19.0.0.1 somehost no "deny, no match" | |||
33 | run_trial user 10.255.255.254 somehost yes "permit, list middle" | 33 | run_trial user 10.255.255.254 somehost yes "permit, list middle" |
34 | run_trial user 192.168.30.1 192.168.0.1 no "deny, faked IP in hostname" | 34 | run_trial user 192.168.30.1 192.168.0.1 no "deny, faked IP in hostname" |
35 | run_trial user 1.1.1.1 somehost.example.com yes "permit, bare IP4 address" | 35 | run_trial user 1.1.1.1 somehost.example.com yes "permit, bare IP4 address" |
36 | test "$TEST_SSH_IPV6" = "no" && exit | ||
36 | run_trial user ::1 somehost.example.com yes "permit, bare IP6 address" | 37 | run_trial user ::1 somehost.example.com yes "permit, bare IP6 address" |
37 | run_trial user ::2 somehost.exaple.com no "deny IPv6" | 38 | run_trial user ::2 somehost.exaple.com no "deny IPv6" |
38 | run_trial user ::3 somehost no "deny IP6 negated" | 39 | run_trial user ::3 somehost no "deny IP6 negated" |