small tweak to man page, and fix some alt port handling in proxy command.

diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8
index ba0c7b34ac9e664e7ca0668f3fc76fa0977f379b..45605dae87f5660114cce9613e8e14c9847edb83 100644 (file)
--- a/man/man8/monkeysphere-server.8
+++ b/man/man8/monkeysphere-server.8
@@ -49,11 +49,11 @@ place of `publish-key'.
 .TP
 .B add-identity-certifier KEYID
 Instruct system to trust user identity certifications made by KEYID.
-`a' may be used in place of `add-certifier'.
+`a' may be used in place of `add-identity-certifier'.
 .TP
 .B remove-identity-certifier KEYID
 Instruct system to ignore user identity certifications made by KEYID.
-`r' may be used in place of `remove-certifier'.
+`r' may be used in place of `remove-identity-certifier'.
 .TP
 .B list-identity-certifiers
 List key IDs trusted by the system to certify user identities.  `l'

diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand
index 30d511a19ebab2b47fe5159eb6e35410bfd7d249..b70f3c69292cbfed7f3034c90e65ee93c2810b2f 100755 (executable)
--- a/src/monkeysphere-ssh-proxycommand
+++ b/src/monkeysphere-ssh-proxycommand
@@ -43,10 +43,12 @@ if [ -z "$PORT" ] ; then
 fi
 
 # set the host URI
-URI="ssh://${HOST}"
 if [ "$PORT" != '22' ] ; then
-    URI="${URI}:${PORT}"
+    HOSTP="${HOST}:${PORT}"
+else
+    HOSTP="${HOST}"
 fi
+URI="ssh://${HOSTP}"
 
 # if the host is in the gpg keyring...
 if gpg --list-key ="${URI}" 2>&1 >/dev/null ; then
@@ -74,7 +76,7 @@ fi
 export CHECK_KEYSERVER
 
 # update the known_hosts file for the host
-monkeysphere update-known_hosts "$HOST"
+monkeysphere update-known_hosts "$HOSTP"
 
 # exec a netcat passthrough to host for the ssh connection
 if [ -z "$NO_CONNECT" ] ; then