Merge commit 'dkg/master'

Conflicts:

	tests/basic

diff --cc tests/basic
index d73e162a0a68b673558e77876c4918102e8ef420,e3cc42eff4faa8515e896b34062519395425d8c0..3f948560bbc0c809c1e6f3db2e4576275ce01928
--- 1/tests/basic
--- 2/tests/basic
+++ b/tests/basic
@@@ -88,17 -78,20 +88,20 @@@ gpgadmin --sign-key "$HOSTKEYID
  # indicate that the "Admin's" key is an identity certifier for the
  # host
  
 -echo "-- adding admin as certifier..."
 +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 >> "$TEMPDIR"/sshd_config
++cat <<EOF >> "$SSHD_CONFIG"
  HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key
+ AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authorized_keys/%u
  EOF
  
 -# launch sshd with the new host key.
 -echo "-- starting sshd..."
 -socat EXEC:'/usr/sbin/sshd -f '"$TEMPDIR"/sshd_config' -i -d -d -d -D -e' "UNIX-LISTEN:${TEMPDIR/socket}" &
 +# launch test sshd with the new host key.
 +echo "### starting sshd..."
 +socat EXEC:'/usr/sbin/sshd -f '"$SSHD_CONFIG"' -i -d -d -d -D -e' "UNIX-LISTEN:${SOCKET}" &
  
  
  ### TESTUSER TESTS