summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--regress/sftp-glob.sh7
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index de61e1755..4bd3b4603 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,7 @@
37 - deraadt@cvs.openbsd.org 2008/03/04 21:15:42 37 - deraadt@cvs.openbsd.org 2008/03/04 21:15:42
38 [version.h] 38 [version.h]
39 crank version; from djm 39 crank version; from djm
40 - (tim) [regress/sftp-glob.sh] Shell portability fix.
40 41
4120080302 4220080302
42 - (dtucker) [configure.ac] FreeBSD's glob() doesn't behave the way we expect 43 - (dtucker) [configure.ac] FreeBSD's glob() doesn't behave the way we expect
@@ -3697,4 +3698,4 @@
3697 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3698 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3698 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3699 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3699 3700
3700$Id: ChangeLog,v 1.4859 2008/03/07 07:35:47 djm Exp $ 3701$Id: ChangeLog,v 1.4860 2008/03/08 03:00:33 tim Exp $
diff --git a/regress/sftp-glob.sh b/regress/sftp-glob.sh
index 62004efc5..60116a748 100644
--- a/regress/sftp-glob.sh
+++ b/regress/sftp-glob.sh
@@ -15,9 +15,12 @@ sftp_ls() {
15 if [ $? -ne 0 ]; then 15 if [ $? -ne 0 ]; then
16 fail "$errtag failed" 16 fail "$errtag failed"
17 fi 17 fi
18 if test "x$expected" != "x" && \ 18 if test "x$expected" != "x" ; then
19 ! fgrep "$expected" ${RESULTS} >/dev/null 2>&1 ; then 19 if fgrep "$expected" ${RESULTS} >/dev/null 2>&1 ; then
20 :
21 else
20 fail "$expected missing from $errtag results" 22 fail "$expected missing from $errtag results"
23 fi
21 fi 24 fi
22 if test "x$unexpected" != "x" && \ 25 if test "x$unexpected" != "x" && \
23 fgrep "$unexpected" ${RESULTS} >/dev/null 2>&1 ; then 26 fgrep "$unexpected" ${RESULTS} >/dev/null 2>&1 ; then