From 7023d161d86211fa6a4c7dfacdad37a53f468512 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 7 Oct 2009 10:30:06 +1100 Subject: [PATCH] - djm@cvs.openbsd.org 2008/12/07 22:17:48 [regress/addrmatch.sh] match string "passwordauthentication" only at start of line, not anywhere in sshd -T output --- ChangeLog | 4 ++++ regress/addrmatch.sh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0914bf05b..826db9eaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,10 @@ [session.c] bz#1596: fflush(NULL) before exec() to ensure that everying (motd in particular) has made it out before the streams go away. + - djm@cvs.openbsd.org 2008/12/07 22:17:48 + [regress/addrmatch.sh] + match string "passwordauthentication" only at start of line, not anywhere + in sshd -T output 20091002 - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps. diff --git a/regress/addrmatch.sh b/regress/addrmatch.sh index a258f7bb4..cbff82e5c 100644 --- 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