RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [Makefile.in configure.ac regress/addrmatch.sh] Skip IPv6 

specific tests on platforms that don't do IPv6.
This commit is contained in:
Darren Tucker 2008-06-11 04:15:05 +10:00
parent d8bafea5a0
commit 5d37690a1f
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -38,8 +38,10 @@
- dtucker@cvs.openbsd.org 2008/06/10 15:28:49
[test-exec.sh]
Add quotes
- (dtucker) [openbsd-compat/fake-rfc2553.h] Add sin6_scope_id to sockaddr_in6
since the new CIDR code in addmatch.c references it.
- (dtucker) [openbsd-compat/fake-rfc2553.h] Add sin6_scope_id to sockaddr_in6
since the new CIDR code in addmatch.c references it.
- (dtucker) [Makefile.in configure.ac regress/addrmatch.sh] Skip IPv6
specific tests on platforms that don't do IPv6.
20080609
- (dtucker) OpenBSD CVS Sync
@ -4126,4 +4128,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4958 2008/06/10 15:39:38 dtucker Exp $
$Id: ChangeLog,v 1.4959 2008/06/10 18:15:05 dtucker Exp $

3
Makefile.in
View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.291 2008/06/10 12:59:10 dtucker Exp $
# $Id: Makefile.in,v 1.292 2008/06/10 18:15:05 dtucker Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@
@ -394,6 +394,7 @@ tests interop-tests: $(TARGETS)
TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
TEST_SSH_PLINK="plink"; \
TEST_SSH_PUTTYGEN="puttygen"; \
TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
cd $(srcdir)/regress || exit $$?; \
$(MAKE) \
.OBJDIR="$${BUILDDIR}/regress" \

11
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.402 2008/06/08 20:17:53 dtucker Exp $
# $Id: configure.ac,v 1.403 2008/06/10 18:15:05 dtucker Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
AC_REVISION($Revision: 1.402 $)
AC_REVISION($Revision: 1.403 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h)
@ -4068,6 +4068,13 @@ dnl Adding -Werror to CFLAGS early prevents configure tests from running.
dnl Add now.
CFLAGS="$CFLAGS $werror_flags"
if grep "#define BROKEN_GETADDRINFO 1" confdefs.h >/dev/null || \
test "x$ac_cv_func_getaddrinfo" != "xyes" ; then
AC_SUBST(TEST_SSH_IPV6, no)
else
AC_SUBST(TEST_SSH_IPV6, yes)
fi
AC_EXEEXT
AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \
openbsd-compat/Makefile openbsd-compat/regress/Makefile \

1
regress/addrmatch.sh
View File

@ -33,6 +33,7 @@ run_trial user 19.0.0.1 somehost no "deny, no match"
run_trial user 10.255.255.254 somehost yes "permit, list middle"
run_trial user 192.168.30.1 192.168.0.1 no "deny, faked IP in hostname"
run_trial user 1.1.1.1 somehost.example.com yes "permit, bare IP4 address"
test "$TEST_SSH_IPV6" = "no" && exit
run_trial user ::1 somehost.example.com yes "permit, bare IP6 address"
run_trial user ::2 somehost.exaple.com no "deny IPv6"
run_trial user ::3 somehost no "deny IP6 negated"