- dtucker@cvs.openbsd.org 2007/10/29 06:57:13

     [regress/Makefile regress/localcommand.sh]
     Add simple regress test for LocalCommand; ok djm@

diff --git a/ChangeLog b/ChangeLog
index e600baf0be31c0ce663dc239357bfeb4c556fe9f..c1317b3000303dd6395b586fb405f76a44487c92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20080311
+ - (djm) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2007/10/29 06:57:13
+     [regress/Makefile regress/localcommand.sh]
+     Add simple regress test for LocalCommand; ok djm@
+
 20080311
  - (dtucker) [auth-pam.c monitor.c session.c sshd.c] Bug #926: Move
    pam_open_session and pam_close_session into the privsep monitor, which

diff --git a/regress/Makefile b/regress/Makefile
index 53995639834d0c3c044f01d6bff539e404773781..196020db80f1315d9f91e28556f590927fffd911 100644 (file)
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.42 2006/07/19 13:34:52 dtucker Exp $
+#      $OpenBSD: Makefile,v 1.43 2007/10/29 06:57:13 dtucker Exp $
 
 REGRESS_TARGETS=       t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:         $(REGRESS_TARGETS)
@@ -42,6 +42,7 @@ LTESTS=       connect \
                reexec \
                brokenkeys \
                cfgmatch \
+               localcommand \
                forcecommand
 
 USER!=         id -un

diff --git a/regress/localcommand.sh b/regress/localcommand.sh
new file mode 100644 (file)
index 0000000..a23e5c6
--- /dev/null
+++ b/regress/localcommand.sh
@@ -0,0 +1,15 @@
+#      $OpenBSD: localcommand.sh,v 1.1 2007/10/29 06:57:13 dtucker Exp $
+#      Placed in the Public Domain.
+
+tid="localcommand"
+
+echo 'PermitLocalCommand yes' >> $OBJ/ssh_proxy
+echo 'LocalCommand echo foo' >> $OBJ/ssh_proxy
+
+for p in 1 2; do
+       verbose "test $tid: proto $p localcommand"
+       a=$(${SSH} -F $OBJ/ssh_proxy -$p somehost true)
+       if [ "$a" != "foo" ] ; then
+               fail "$tid proto $p"
+       fi
+done