summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-03-12 23:58:05 +1100
committerDamien Miller <djm@mindrot.org>2008-03-12 23:58:05 +1100
commita5e584274dfa631def56403a0b92bf354067ca5a (patch)
tree6d00825a7276eb33970e3f991481453504b8f42e
parent1e42689ad5a2e78b24369a56e01fc777611da745 (diff)
- dtucker@cvs.openbsd.org 2007/10/29 06:57:13
[regress/Makefile regress/localcommand.sh] Add simple regress test for LocalCommand; ok djm@
-rw-r--r--ChangeLog8
-rw-r--r--regress/Makefile3
-rw-r--r--regress/localcommand.sh15
3 files changed, 24 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 756147f8..5d82f351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
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
will ensure that pam_session_close is called as root. Patch from Tomas
@@ -3718,4 +3724,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.4866 2008/03/11 12:01:44 dtucker Exp $
+$Id: ChangeLog,v 1.4867 2008/03/12 12:58:05 djm Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 53995639..196020db 100644
--- 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
index 00000000..a23e5c67
--- /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