summaryrefslogtreecommitdiff
path: root/regress/addrmatch.sh
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-04-27 10:55:39 +1000
committerDarren Tucker <dtucker@zip.com.au>2012-04-27 10:55:39 +1000
commitd0d3fff483379baf1f38c00415c7895b41b37df9 (patch)
treefb74459d7029585f52a5e0ccb35f843cb9c44837 /regress/addrmatch.sh
parent025bfd11d987b62ecfe3283acfd21933222d4330 (diff)
- (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
Diffstat (limited to 'regress/addrmatch.sh')
-rw-r--r--regress/addrmatch.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/regress/addrmatch.sh b/regress/addrmatch.sh
index 23ddd65ce..5102317df 100644
--- a/regress/addrmatch.sh
+++ b/regress/addrmatch.sh
@@ -33,13 +33,14 @@ run_trial user 19.0.0.1 somehost no "deny, no match"
33run_trial user 10.255.255.254 somehost yes "permit, list middle" 33run_trial user 10.255.255.254 somehost yes "permit, list middle"
34run_trial user 192.168.30.1 192.168.0.1 no "deny, faked IP in hostname" 34run_trial user 192.168.30.1 192.168.0.1 no "deny, faked IP in hostname"
35run_trial user 1.1.1.1 somehost.example.com yes "permit, bare IP4 address" 35run_trial user 1.1.1.1 somehost.example.com yes "permit, bare IP4 address"
36test "$TEST_SSH_IPV6" = "no" && exit 36if test "$TEST_SSH_IPV6" != "no"; then
37run_trial user ::1 somehost.example.com yes "permit, bare IP6 address" 37run_trial user ::1 somehost.example.com yes "permit, bare IP6 address"
38run_trial user ::2 somehost.exaple.com no "deny IPv6" 38run_trial user ::2 somehost.exaple.com no "deny IPv6"
39run_trial user ::3 somehost no "deny IP6 negated" 39run_trial user ::3 somehost no "deny IP6 negated"
40run_trial user ::4 somehost no "deny, IP6 no match" 40run_trial user ::4 somehost no "deny, IP6 no match"
41run_trial user 2000::1 somehost yes "permit, IP6 network" 41run_trial user 2000::1 somehost yes "permit, IP6 network"
42run_trial user 2001::1 somehost no "deny, IP6 network" 42run_trial user 2001::1 somehost no "deny, IP6 network"
43fi
43 44
44cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy 45cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
45rm $OBJ/sshd_proxy_bak 46rm $OBJ/sshd_proxy_bak