Merge commit 'dkg/master'

Conflicts:

	tests/basic

diff --git a/tests/basic b/tests/basic
index d73e162a0a68b673558e77876c4918102e8ef420..3f948560bbc0c809c1e6f3db2e4576275ce01928 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -91,9 +91,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 > "$SSHD_CONFIG"
+cat <<EOF >> "$SSHD_CONFIG"
 HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key
+AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authorized_keys/%u
 EOF
 
 # launch test sshd with the new host key.

diff --git a/tests/etc/ssh/sshd_config b/tests/etc/ssh/sshd_config
new file mode 100644 (file)
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