summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--regress/key-options.sh6
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 46785b799..b92e6be07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,11 @@
18 - dtucker@cvs.openbsd.org 2008/07/04 03:47:02 18 - dtucker@cvs.openbsd.org 2008/07/04 03:47:02
19 [monitor.c] 19 [monitor.c]
20 Make debug a little clearer. ok djm@ 20 Make debug a little clearer. ok djm@
21 - djm@cvs.openbsd.org 2008/06/30 08:07:34
22 [regress/key-options.sh]
23 shell portability: use "=" instead of "==" in test(1) expressions,
24 double-quote string with backslash escaped /
25
21 - (dtucker) [sftp-server.c] Bug #1447: fall back to racy rename if link 26 - (dtucker) [sftp-server.c] Bug #1447: fall back to racy rename if link
22 returns EXDEV. Patch from Mike Garrison, ok djm@ 27 returns EXDEV. Patch from Mike Garrison, ok djm@
23 28
@@ -4555,4 +4560,4 @@
4555 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4560 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4556 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4561 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4557 4562
4558$Id: ChangeLog,v 1.5054 2008/07/04 04:10:19 dtucker Exp $ 4563$Id: ChangeLog,v 1.5055 2008/07/04 07:08:58 dtucker Exp $
diff --git a/regress/key-options.sh b/regress/key-options.sh
index b4dd47057..f98d78b30 100644
--- a/regress/key-options.sh
+++ b/regress/key-options.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: key-options.sh,v 1.1 2008/06/10 23:13:43 dtucker Exp $ 1# $OpenBSD: key-options.sh,v 1.2 2008/06/30 08:07:34 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="key options" 4tid="key options"
@@ -53,11 +53,11 @@ for p in 1 2; do
53 fail "key option proto $p failed without restriction" 53 fail "key option proto $p failed without restriction"
54 fi 54 fi
55 55
56 sed 's/.*/from="'$f'" &/' $origkeys >$authkeys 56 sed 's/.*/from="'"$f"'" &/' $origkeys >$authkeys
57 from=`head -1 $authkeys | cut -f1 -d ' '` 57 from=`head -1 $authkeys | cut -f1 -d ' '`
58 verbose "key option proto $p $from" 58 verbose "key option proto $p $from"
59 r=`${SSH} -$p -q -F $OBJ/ssh_proxy somehost 'echo true'` 59 r=`${SSH} -$p -q -F $OBJ/ssh_proxy somehost 'echo true'`
60 if [ "$r" == "true" ]; then 60 if [ "$r" = "true" ]; then
61 fail "key option proto $p $from not restricted" 61 fail "key option proto $p $from not restricted"
62 fi 62 fi
63 63