From 7b1877c803021430818ad7bd6bff504f0de1658f Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 24 Jul 2006 15:31:41 +1000
Subject:  - (djm) [regress/Makefile regress/agent-getpeereid.sh
 regress/cfgmatch.sh]    [regress/cipher-speed.sh regress/forcecommand.sh
 regress/forwarding.sh]    Sync regress tests to -current; include dtucker@'s
 new cfgmatch and    forcecommand tests. Add cipher-speed.sh test (not linked
 in yet)

---
 regress/forcecommand.sh | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 regress/forcecommand.sh

(limited to 'regress/forcecommand.sh')

diff --git a/regress/forcecommand.sh b/regress/forcecommand.sh
new file mode 100644
index 000000000..796e7c2c0
--- /dev/null
+++ b/regress/forcecommand.sh
@@ -0,0 +1,42 @@
+#	$OpenBSD: forcecommand.sh,v 1.1 2006/07/19 13:09:28 dtucker Exp $
+#	Placed in the Public Domain.
+
+tid="forced command"
+
+cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
+
+echo -n 'command="true" ' >$OBJ/authorized_keys_$USER
+cat $OBJ/rsa.pub >> $OBJ/authorized_keys_$USER
+echo -n 'command="true" ' >>$OBJ/authorized_keys_$USER
+cat $OBJ/rsa1.pub >> $OBJ/authorized_keys_$USER
+
+for p in 1 2; do
+	trace "forced command in key option proto $p"
+	${SSH} -$p -F $OBJ/ssh_proxy somehost false \ ||
+	    fail "forced command in key proto $p"
+done
+
+echo -n 'command="false" ' >$OBJ/authorized_keys_$USER
+cat $OBJ/rsa.pub >> $OBJ/authorized_keys_$USER
+echo -n 'command="false" ' >>$OBJ/authorized_keys_$USER
+cat $OBJ/rsa1.pub >> $OBJ/authorized_keys_$USER
+
+cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
+echo "ForceCommand true" >> $OBJ/sshd_proxy
+
+for p in 1 2; do
+	trace "forced command in sshd_config overrides key option proto $p"
+	${SSH} -$p -F $OBJ/ssh_proxy somehost false \ ||
+	    fail "forced command in key proto $p"
+done
+
+cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
+echo "ForceCommand false" >> $OBJ/sshd_proxy
+echo "Match User $USER" >> $OBJ/sshd_proxy
+echo "    ForceCommand true" >> $OBJ/sshd_proxy
+
+for p in 1 2; do
+	trace "forced command with match proto $p"
+	${SSH} -$p -F $OBJ/ssh_proxy somehost false \ ||
+	    fail "forced command in key proto $p"
+done
-- 
cgit v1.2.3


From 28e9ad1bed41dd0a7ed9f8df64f97207e14c1072 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 24 Jul 2006 23:50:23 +1000
Subject:  - (dtucker) [regress/forcecommand.sh] Portablize.

---
 ChangeLog               | 3 ++-
 regress/forcecommand.sh | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'regress/forcecommand.sh')

diff --git a/ChangeLog b/ChangeLog
index 8982fe417..77af8bef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -137,6 +137,7 @@
    forcecommand tests. Add cipher-speed.sh test (not linked in yet)
  - (dtucker) [cleanup.c] Since config.h defines _LARGE_FILES on AIX, including
    system headers before defines.h will cause conflicting definitions.
+ - (dtucker) [regress/forcecommand.sh] Portablize.
 
 20060713
  - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -5055,4 +5056,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4437 2006/07/24 13:19:40 dtucker Exp $
+$Id: ChangeLog,v 1.4438 2006/07/24 13:50:23 dtucker Exp $
diff --git a/regress/forcecommand.sh b/regress/forcecommand.sh
index 796e7c2c0..99e51a60f 100644
--- a/regress/forcecommand.sh
+++ b/regress/forcecommand.sh
@@ -5,9 +5,9 @@ tid="forced command"
 
 cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
 
-echo -n 'command="true" ' >$OBJ/authorized_keys_$USER
+echon 'command="true" ' >$OBJ/authorized_keys_$USER
 cat $OBJ/rsa.pub >> $OBJ/authorized_keys_$USER
-echo -n 'command="true" ' >>$OBJ/authorized_keys_$USER
+echon 'command="true" ' >>$OBJ/authorized_keys_$USER
 cat $OBJ/rsa1.pub >> $OBJ/authorized_keys_$USER
 
 for p in 1 2; do
@@ -16,9 +16,9 @@ for p in 1 2; do
 	    fail "forced command in key proto $p"
 done
 
-echo -n 'command="false" ' >$OBJ/authorized_keys_$USER
+echon 'command="false" ' >$OBJ/authorized_keys_$USER
 cat $OBJ/rsa.pub >> $OBJ/authorized_keys_$USER
-echo -n 'command="false" ' >>$OBJ/authorized_keys_$USER
+echon 'command="false" ' >>$OBJ/authorized_keys_$USER
 cat $OBJ/rsa1.pub >> $OBJ/authorized_keys_$USER
 
 cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
-- 
cgit v1.2.3