Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere

[monkeysphere.git] / man / man1 / monkeysphere-ssh-proxycommand.1

diff --git a/man/man1/monkeysphere-ssh-proxycommand.1 b/man/man1/monkeysphere-ssh-proxycommand.1
index 8392ae8317e8631b550b79080857de630a80c9aa..c4196f2b4afbd392272e8dffa40856ec6ebcb9a9 100644 (file)
--- a/man/man1/monkeysphere-ssh-proxycommand.1
+++ b/man/man1/monkeysphere-ssh-proxycommand.1
@@ -18,18 +18,29 @@ or by adding the following line to your ~/.ssh/config script:
 
 .B ProxyCommand monkeysphere-ssh-proxycommand %h %p
 
-The script is very simple, and can easily be incorporated into other
-ProxyCommand scripts.  All it does is first runs
+The script can easily be incorporated into other ProxyCommand scripts
+by calling it with the "--no-connect" option, ie:
 
-.B monkeysphere update-known-hosts HOST
+.B monkeysphere-ssh-proxycommand --no-connect "$HOST" "$PORT"
 
-and then
+This will run everything but will not exec netcat to make the tcp
+connection to the host.
 
-.B exec nc HOST PORT
+.SH KEYSERVER CHECKING
 
-Run the following command for more info:
+The proxy command has a fairly nuanced policy for when keyservers are
+queried when processing host.  If the host userID is not found in
+either the user's keyring or in the known_hosts file, then the
+keyserver is queried for the host userID.  If the host userID is found
+in the user's keyring, then the keyserver is not checked.  This is
+because...  If the host userID is not found in the user's keyring, but
+the host is listed in the known_hosts file, then defered check is
+scheduled.
 
-.B less $(which monkeysphere-ssh-proxycommand)
+.SH ENVIRONMENT VARIABLES
+
+.TP
+KEYSERVER The keyserver to query.
 
 .SH AUTHOR