summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--regress/Makefile7
-rw-r--r--regress/host-expand.sh18
3 files changed, 26 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e2089620..4fc608814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@
9 [clientloop.c] 9 [clientloop.c]
10 when exiting due to ServerAliveTimeout, mention the hostname that caused 10 when exiting due to ServerAliveTimeout, mention the hostname that caused
11 it (useful with backgrounded controlmaster) 11 it (useful with backgrounded controlmaster)
12 - djm@cvs.openbsd.org 2011/01/06 22:46:21
13 [regress/Makefile regress/host-expand.sh]
14 regress test for LocalCommand %n expansion from bert.wesarg AT
15 googlemail.com; ok markus@
12 16
1320110106 1720110106
14 - (djm) OpenBSD CVS Sync 18 - (djm) OpenBSD CVS Sync
diff --git a/regress/Makefile b/regress/Makefile
index 9ebb2500e..85fd3a5ad 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.57 2010/09/22 12:26:05 djm Exp $ 1# $OpenBSD: Makefile,v 1.58 2011/01/06 22:46:21 djm Exp $
2 2
3REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec 3REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec
4tests: $(REGRESS_TARGETS) 4tests: $(REGRESS_TARGETS)
@@ -56,7 +56,8 @@ LTESTS= connect \
56 keytype \ 56 keytype \
57 kextype \ 57 kextype \
58 cert-hostkey \ 58 cert-hostkey \
59 cert-userkey 59 cert-userkey \
60 host-expand
60 61
61INTEROP_TESTS= putty-transfer putty-ciphers putty-kex conch-ciphers 62INTEROP_TESTS= putty-transfer putty-ciphers putty-kex conch-ciphers
62#INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp 63#INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
@@ -75,7 +76,7 @@ CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
75 sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \ 76 sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \
76 known_hosts-cert host_ca_key* cert_host_key* \ 77 known_hosts-cert host_ca_key* cert_host_key* \
77 putty.rsa2 sshd_proxy_orig \ 78 putty.rsa2 sshd_proxy_orig \
78 authorized_principals_${USER} 79 authorized_principals_${USER} expect actual
79 80
80# Enable all malloc(3) randomisations and checks 81# Enable all malloc(3) randomisations and checks
81TEST_ENV= "MALLOC_OPTIONS=AFGJPRX" 82TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
diff --git a/regress/host-expand.sh b/regress/host-expand.sh
new file mode 100644
index 000000000..c0417d9c9
--- /dev/null
+++ b/regress/host-expand.sh
@@ -0,0 +1,18 @@
1# Placed in the Public Domain.
2
3tid="expand %h and %n"
4
5echo 'PermitLocalCommand yes' >> $OBJ/ssh_proxy
6printf 'LocalCommand printf "%%%%s\\n" "%%n" "%%h"\n' >> $OBJ/ssh_proxy
7
8cat >expect <<EOE
9somehost
10127.0.0.1
11EOE
12
13for p in 1 2; do
14 verbose "test $tid: proto $p"
15 ${SSH} -F $OBJ/ssh_proxy -$p somehost true >actual
16 diff expect actual || fail "$tid proto $p"
17done
18