From: Jameson Rollins <jrollins@finestructure.net>
Date: Sat, 16 Jan 2010 00:42:42 +0000 (-0500)
Subject: Merge remote branch 'dkg/master'
X-Git-Tag: monkeysphere_0.28~41
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=17315937bc0af145ef7dfb749096faad49f208aa;p=monkeysphere.git

Merge remote branch 'dkg/master'

Conflicts:
	tests/basic
---

17315937bc0af145ef7dfb749096faad49f208aa
diff --cc tests/basic
index 8cf0933,f808387..15afa77
--- a/tests/basic
+++ b/tests/basic
@@@ -272,8 -270,8 +272,8 @@@ monkeysphere-host set-expire 
  echo
  echo "##################################################"
  echo "### certifying server host key..."
 -< "$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg gpgadmin --import
 +< "$HOST_KEY_FILE" gpgadmin --import
- echo y | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
+ echo y | gpgadmin --command-fd 0 --sign-key "$SSHHOSTKEYID"
  
  # FIXME: add revoker?
  
@@@ -501,10 -505,10 +507,10 @@@ echo "### ssh connection test directly 
  target_hostname=testhost2 ssh_test 255
  echo
  echo "##################################################"
- echo "### add hostname, certify by admin, import by user..."
- monkeysphere-host add-hostname ssh://testhost2
+ echo "### add servicename, certify by admin, import by user..."
+ monkeysphere-host add-servicename ssh://testhost2
 -< "$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg gpgadmin --import
 +<"$HOST_KEY_FILE" gpgadmin --import
- printf "y\ny\n" | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
+ printf "y\ny\n" | gpgadmin --command-fd 0 --sign-key "$SSHHOSTKEYID"
  
  echo
  echo "##################################################"
@@@ -523,8 -527,8 +529,8 @@@ target_hostname=testhost2 ssh_tes
  echo
  echo "##################################################"
  echo "### ssh connection test for failure with 'testhost2' revoked..."
- monkeysphere-host revoke-hostname ssh://testhost2
+ monkeysphere-host revoke-servicename ssh://testhost2
 -gpg --import <"$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg
 +gpg --import <"$HOST_KEY_FILE"
  gpg --check-trustdb
  target_hostname=testhost2 ssh_test 255