- markus@cvs.openbsd.org 2010/01/15 09:24:23

[openssh.git] / regress / addrmatch.sh

diff --git a/regress/addrmatch.sh b/regress/addrmatch.sh
index a05df1539a4f49ed405d31526112b12f53867827..cbff82e5c2b179094f069639eaf793c2ca28be77 100644 (file)
--- a/regress/addrmatch.sh
+++ b/regress/addrmatch.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: addrmatch.sh,v 1.1 2008/06/10 05:23:32 dtucker Exp $
+#      $OpenBSD: addrmatch.sh,v 1.2 2008/12/07 22:17:48 djm Exp $
 #      Placed in the Public Domain.
 
 tid="address match"
@@ -12,7 +12,7 @@ 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
@@ -33,6 +33,7 @@ run_trial user 19.0.0.1 somehost no           "deny, no match"
 run_trial user 10.255.255.254 somehost yes     "permit, list middle"
 run_trial user 192.168.30.1 192.168.0.1 no     "deny, faked IP in hostname"
 run_trial user 1.1.1.1 somehost.example.com yes        "permit, bare IP4 address"
+test "$TEST_SSH_IPV6" = "no" && exit
 run_trial user ::1 somehost.example.com         yes    "permit, bare IP6 address"
 run_trial user ::2 somehost.exaple.com no      "deny IPv6"
 run_trial user ::3 somehost no                 "deny IP6 negated"