1 files changed, 7 insertions, 4 deletions

diff --git a/regress/addrmatch.sh b/regress/addrmatch.sh
index a258f7bb4..23ddd65ce 100644
--- a/regress/addrmatch.sh
+++ b/regress/addrmatch.sh
@@ -1,9 +1,9 @@
-#       $OpenBSD: addrmatch.sh,v 1.1 2008/06/10 05:23:32 dtucker 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()
 {
@@ -12,13 +12,13 @@ run_trial()
         verbose "test $descr for $user $addr $host"
         result=`${SSHD} -f $OBJ/sshd_proxy -T \
             -C user=${user},addr=${addr},host=${host} | \
-            awk '/passwordauthentication/ {print $2}'`
+            awk '/^passwordauthentication/ {print $2}'`
         if [ "$result" != "$expected" ]; then
                 fail "failed for $user $addr $host: expected $expected, got $result"
         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