- 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 /

diff --git a/ChangeLog b/ChangeLog
index 055bce9ef5d71780df580e710168a7e8f51390d0..66a80f9181695475033dfa035955dfedb8e161ed 100644 (file)
--- 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@
 

diff --git a/regress/key-options.sh b/regress/key-options.sh
index b4dd470573e0f32eb0bcb9be5d2a729b2c6c0930..f98d78b30774cf8096912a31801c443cf91e723c 100644 (file)
--- 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