diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | regress/addrmatch.sh | 9 |
2 files changed, 9 insertions, 3 deletions
@@ -11,6 +11,9 @@ | |||
11 | - dtucker@cvs.openbsd.org 2010/01/11 02:53:44 | 11 | - dtucker@cvs.openbsd.org 2010/01/11 02:53:44 |
12 | [regress/forwarding.sh] | 12 | [regress/forwarding.sh] |
13 | regress test for stdio forwarding | 13 | regress test for stdio forwarding |
14 | - djm@cvs.openbsd.org 2010/02/09 04:57:36 | ||
15 | [regress/addrmatch.sh] | ||
16 | clean up droppings | ||
14 | 17 | ||
15 | 20100212 | 18 | 20100212 |
16 | - (djm) OpenBSD CVS Sync | 19 | - (djm) OpenBSD CVS Sync |
diff --git a/regress/addrmatch.sh b/regress/addrmatch.sh index cbff82e5c..23ddd65ce 100644 --- a/regress/addrmatch.sh +++ b/regress/addrmatch.sh | |||
@@ -1,9 +1,9 @@ | |||
1 | # $OpenBSD: addrmatch.sh,v 1.2 2008/12/07 22:17:48 djm Exp $ | 1 | # $OpenBSD: addrmatch.sh,v 1.3 2010/02/09 04:57:36 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="address match" | 4 | tid="address match" |
5 | 5 | ||
6 | mv $OBJ/sshd_proxy $OBJ/sshd_proxy_orig | 6 | mv $OBJ/sshd_proxy $OBJ/sshd_proxy_bak |
7 | 7 | ||
8 | run_trial() | 8 | run_trial() |
9 | { | 9 | { |
@@ -18,7 +18,7 @@ run_trial() | |||
18 | fi | 18 | fi |
19 | } | 19 | } |
20 | 20 | ||
21 | cp $OBJ/sshd_proxy_orig $OBJ/sshd_proxy | 21 | cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy |
22 | cat >>$OBJ/sshd_proxy <<EOD | 22 | cat >>$OBJ/sshd_proxy <<EOD |
23 | PasswordAuthentication no | 23 | PasswordAuthentication no |
24 | Match Address 192.168.0.0/16,!192.168.30.0/24,10.0.0.0/8,host.example.com | 24 | Match Address 192.168.0.0/16,!192.168.30.0/24,10.0.0.0/8,host.example.com |
@@ -40,3 +40,6 @@ run_trial user ::3 somehost no "deny IP6 negated" | |||
40 | run_trial user ::4 somehost no "deny, IP6 no match" | 40 | run_trial user ::4 somehost no "deny, IP6 no match" |
41 | run_trial user 2000::1 somehost yes "permit, IP6 network" | 41 | run_trial user 2000::1 somehost yes "permit, IP6 network" |
42 | run_trial user 2001::1 somehost no "deny, IP6 network" | 42 | run_trial user 2001::1 somehost no "deny, IP6 network" |
43 | |||
44 | cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy | ||
45 | rm $OBJ/sshd_proxy_bak | ||