summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--regress/addrmatch.sh9
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 33e052bbb..0765008f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
1520100212 1820100212
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
4tid="address match" 4tid="address match"
5 5
6mv $OBJ/sshd_proxy $OBJ/sshd_proxy_orig 6mv $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
7 7
8run_trial() 8run_trial()
9{ 9{
@@ -18,7 +18,7 @@ run_trial()
18 fi 18 fi
19} 19}
20 20
21cp $OBJ/sshd_proxy_orig $OBJ/sshd_proxy 21cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
22cat >>$OBJ/sshd_proxy <<EOD 22cat >>$OBJ/sshd_proxy <<EOD
23PasswordAuthentication no 23PasswordAuthentication no
24Match Address 192.168.0.0/16,!192.168.30.0/24,10.0.0.0/8,host.example.com 24Match 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"
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"
43
44cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
45rm $OBJ/sshd_proxy_bak