summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-07-04 17:08:58 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-07-04 17:08:58 +1000
commit8c7a14ea2897c384d4c2ebbb0d96eb8f84544d6a (patch)
tree639e9aefb83af3fbf96c372838846a17aa7ef762
parentf7fa706e70cc3d005acca995d022d65227185dcd (diff)
- djm@cvs.openbsd.org 2008/06/30 08:07:34
[key-options.sh] shell portability: use "=" instead of "==" in test(1) expressions, double-quote string with backslash escaped /
-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 46785b79..b92e6be0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,11 @@
- dtucker@cvs.openbsd.org 2008/07/04 03:47:02
[monitor.c]
Make debug a little clearer. ok djm@
+ - djm@cvs.openbsd.org 2008/06/30 08:07:34
+ [regress/key-options.sh]
+ shell portability: use "=" instead of "==" in test(1) expressions,
+ double-quote string with backslash escaped /
+
- (dtucker) [sftp-server.c] Bug #1447: fall back to racy rename if link
returns EXDEV. Patch from Mike Garrison, ok djm@
@@ -4555,4 +4560,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.5054 2008/07/04 04:10:19 dtucker Exp $
+$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 b4dd4705..f98d78b3 100644
--- a/regress/key-options.sh
+++ b/regress/key-options.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: key-options.sh,v 1.1 2008/06/10 23:13:43 dtucker Exp $
+# $OpenBSD: key-options.sh,v 1.2 2008/06/30 08:07:34 djm Exp $
# Placed in the Public Domain.
tid="key options"
@@ -53,11 +53,11 @@ for p in 1 2; do
fail "key option proto $p failed without restriction"
fi
- sed 's/.*/from="'$f'" &/' $origkeys >$authkeys
+ sed 's/.*/from="'"$f"'" &/' $origkeys >$authkeys
from=`head -1 $authkeys | cut -f1 -d ' '`
verbose "key option proto $p $from"
r=`${SSH} -$p -q -F $OBJ/ssh_proxy somehost 'echo true'`
- if [ "$r" == "true" ]; then
+ if [ "$r" = "true" ]; then
fail "key option proto $p $from not restricted"
fi