From 63220169a21989352825e22cb464a2297526f9aa Mon Sep 17 00:00:00 2001
From: Markus Friedl <mfriedl@gmail.com>
Date: Thu, 5 Jan 2012 19:34:30 +0100
Subject: [PATCH] login-shell agnostic tests

---
 regress/host-expand.sh      | 5 ++---
 regress/sshd-log-wrapper.sh | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/regress/host-expand.sh b/regress/host-expand.sh
index c0417d9..5d81feb 100644
--- a/regress/host-expand.sh
+++ b/regress/host-expand.sh
@@ -3,11 +3,10 @@
 tid="expand %h and %n"
 
 echo 'PermitLocalCommand yes' >> $OBJ/ssh_proxy
-printf 'LocalCommand printf "%%%%s\\n" "%%n" "%%h"\n' >> $OBJ/ssh_proxy
+echo 'LocalCommand echo %n-%h' >> $OBJ/ssh_proxy
 
 cat >expect <<EOE
-somehost
-127.0.0.1
+somehost-127.0.0.1
 EOE
 
 for p in 1 2; do
diff --git a/regress/sshd-log-wrapper.sh b/regress/sshd-log-wrapper.sh
index c7a5ef3..09a8736 100644
--- a/regress/sshd-log-wrapper.sh
+++ b/regress/sshd-log-wrapper.sh
@@ -10,4 +10,4 @@ log=$2
 shift
 shift
 
-exec $sshd $@ -e 2>>$log
+exec ktrace -i $sshd $@ -e 2>>$log