From 5f29ad789dda115b477d53fbedd3a71b64962e27 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 25 Oct 2008 14:17:34 -0400
Subject: [PATCH] test now has better sshd configuration.

---
 tests/basic               |  5 ++++-
 tests/etc/ssh/sshd_config | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 tests/etc/ssh/sshd_config

diff --git a/tests/basic b/tests/basic
index b9ae8f1..e3cc42e 100755
--- a/tests/basic
+++ b/tests/basic
@@ -81,9 +81,12 @@ gpgadmin --sign-key "$HOSTKEYID"
 echo "-- adding admin as certifier..."
 monkeysphere-server add-identity-certifier "$TESTDIR"/home/admin/.gnupg/pubkey.gpg
 
+# initialize base sshd_config
+cp etc/ssh/sshd_config "$TEMPDIR"/sshd_config
 # write the sshd_config
-cat <<EOF > "$TEMPDIR"/sshd_config
+cat <<EOF >> "$TEMPDIR"/sshd_config
 HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key
+AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authorized_keys/%u
 EOF
 
 # launch sshd with the new host key.
diff --git a/tests/etc/ssh/sshd_config b/tests/etc/ssh/sshd_config
new file mode 100644
index 0000000..75f0314
--- /dev/null
+++ b/tests/etc/ssh/sshd_config
@@ -0,0 +1,21 @@
+# Base sshd_config for monkeysphere test
+
+# HostKey and AuthorizedKeysFile lines will be added dynamically
+# during test.
+
+# goal: minimal ssh configuration to do public key authentication.
+
+Protocol 2
+PubkeyAuthentication yes
+HostbasedAuthentication no
+PermitEmptyPasswords no
+ChallengeResponseAuthentication no
+PasswordAuthentication no
+KerberosAuthentication no
+GSSAPIAuthentication no
+X11Forwarding no
+PrintMotd no
+PrintLastLog no
+TCPKeepAlive no
+AcceptEnv LANG LC_*
+UsePAM no
-- 
2.25.1