diff options
| -rw-r--r-- | man/man8/monkeysphere-server.8 | 4 | ||||
| -rwxr-xr-x | src/monkeysphere-ssh-proxycommand | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8 index ba0c7b3..45605da 100644 --- 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 30d511a..b70f3c6 100755 --- 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 |