diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | regress/Makefile | 3 | ||||
-rw-r--r-- | regress/localcommand.sh | 15 |
3 files changed, 24 insertions, 2 deletions
@@ -1,4 +1,10 @@ | |||
1 | 20080311 | 1 | 20080311 |
2 | - (djm) OpenBSD CVS Sync | ||
3 | - dtucker@cvs.openbsd.org 2007/10/29 06:57:13 | ||
4 | [regress/Makefile regress/localcommand.sh] | ||
5 | Add simple regress test for LocalCommand; ok djm@ | ||
6 | |||
7 | 20080311 | ||
2 | - (dtucker) [auth-pam.c monitor.c session.c sshd.c] Bug #926: Move | 8 | - (dtucker) [auth-pam.c monitor.c session.c sshd.c] Bug #926: Move |
3 | pam_open_session and pam_close_session into the privsep monitor, which | 9 | pam_open_session and pam_close_session into the privsep monitor, which |
4 | will ensure that pam_session_close is called as root. Patch from Tomas | 10 | will ensure that pam_session_close is called as root. Patch from Tomas |
@@ -3718,4 +3724,4 @@ | |||
3718 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3724 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3719 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3725 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3720 | 3726 | ||
3721 | $Id: ChangeLog,v 1.4866 2008/03/11 12:01:44 dtucker Exp $ | 3727 | $Id: ChangeLog,v 1.4867 2008/03/12 12:58:05 djm Exp $ |
diff --git a/regress/Makefile b/regress/Makefile index 539956398..196020db8 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.42 2006/07/19 13:34:52 dtucker Exp $ | 1 | # $OpenBSD: Makefile,v 1.43 2007/10/29 06:57:13 dtucker Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec | 3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec |
4 | tests: $(REGRESS_TARGETS) | 4 | tests: $(REGRESS_TARGETS) |
@@ -42,6 +42,7 @@ LTESTS= connect \ | |||
42 | reexec \ | 42 | reexec \ |
43 | brokenkeys \ | 43 | brokenkeys \ |
44 | cfgmatch \ | 44 | cfgmatch \ |
45 | localcommand \ | ||
45 | forcecommand | 46 | forcecommand |
46 | 47 | ||
47 | USER!= id -un | 48 | USER!= id -un |
diff --git a/regress/localcommand.sh b/regress/localcommand.sh new file mode 100644 index 000000000..a23e5c678 --- /dev/null +++ b/regress/localcommand.sh | |||
@@ -0,0 +1,15 @@ | |||
1 | # $OpenBSD: localcommand.sh,v 1.1 2007/10/29 06:57:13 dtucker Exp $ | ||
2 | # Placed in the Public Domain. | ||
3 | |||
4 | tid="localcommand" | ||
5 | |||
6 | echo 'PermitLocalCommand yes' >> $OBJ/ssh_proxy | ||
7 | echo 'LocalCommand echo foo' >> $OBJ/ssh_proxy | ||
8 | |||
9 | for p in 1 2; do | ||
10 | verbose "test $tid: proto $p localcommand" | ||
11 | a=$(${SSH} -F $OBJ/ssh_proxy -$p somehost true) | ||
12 | if [ "$a" != "foo" ] ; then | ||
13 | fail "$tid proto $p" | ||
14 | fi | ||
15 | done | ||