login-shell agnostic tests

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

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