summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-02-24 17:26:38 +1100
committerDamien Miller <djm@mindrot.org>2010-02-24 17:26:38 +1100
commitbb4ae5583bffe27d9485198e199bea9767701bb1 (patch)
treef41fb34231c516d2b1b9f9717fd7e20e6ff53e69
parent0dff9c7e6d1fd0025ad7b137d2201f9f8bdaadc5 (diff)
- djm@cvs.openbsd.org 2010/02/09 04:57:36
[regress/addrmatch.sh] clean up droppings
-rw-r--r--ChangeLog3
-rw-r--r--regress/addrmatch.sh9
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 33e052bb..0765008f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
- dtucker@cvs.openbsd.org 2010/01/11 02:53:44
[regress/forwarding.sh]
regress test for stdio forwarding
+ - djm@cvs.openbsd.org 2010/02/09 04:57:36
+ [regress/addrmatch.sh]
+ clean up droppings
20100212
- (djm) OpenBSD CVS Sync
diff --git a/regress/addrmatch.sh b/regress/addrmatch.sh
index cbff82e5..23ddd65c 100644
--- a/regress/addrmatch.sh
+++ b/regress/addrmatch.sh
@@ -1,9 +1,9 @@
-# $OpenBSD: addrmatch.sh,v 1.2 2008/12/07 22:17:48 djm Exp $
+# $OpenBSD: addrmatch.sh,v 1.3 2010/02/09 04:57:36 djm Exp $
# Placed in the Public Domain.
tid="address match"
-mv $OBJ/sshd_proxy $OBJ/sshd_proxy_orig
+mv $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
run_trial()
{
@@ -18,7 +18,7 @@ run_trial()
fi
}
-cp $OBJ/sshd_proxy_orig $OBJ/sshd_proxy
+cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
cat >>$OBJ/sshd_proxy <<EOD
PasswordAuthentication no
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"
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"
+
+cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
+rm $OBJ/sshd_proxy_bak