- (dtucker) [regress/addrmatch.sh] skip tests when running on a non-ipv6

platform rather than exiting early, so that we still clean up and return
   status to test-exec.sh
This commit is contained in:
Darren Tucker 2012-04-27 10:55:39 +10:00
parent 025bfd11d9
commit d0d3fff483
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,8 @@
20120427
- (dtucker) [regress/addrmatch.sh] skip tests when running on a non-ipv6
platform rather than exiting early, so that we still clean up and return
success or failure to test-exec.sh
20120426
- (djm) [auth-passwd.c] Handle crypt() returning NULL; from Paul Wouters
via Niels

View File

@ -33,13 +33,14 @@ 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
if test "$TEST_SSH_IPV6" != "no"; then
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"
run_trial user ::4 somehost no "deny, IP6 no match"
run_trial user 2000::1 somehost yes "permit, IP6 network"
run_trial user 2001::1 somehost no "deny, IP6 network"
fi
cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
rm $OBJ/sshd_proxy_bak