X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=man%2Fman1%2Fmonkeysphere-ssh-proxycommand.1;h=a31a9d1598b7f671dce9dca6916be9faed6275b9;hb=86b6a09beeba248440d4d9a5e923c799c542420d;hp=8392ae8317e8631b550b79080857de630a80c9aa;hpb=fa49fb68ca77761682fd4547debfabda403f0212;p=monkeysphere.git

diff --git a/man/man1/monkeysphere-ssh-proxycommand.1 b/man/man1/monkeysphere-ssh-proxycommand.1
index 8392ae8..a31a9d1 100644
--- a/man/man1/monkeysphere-ssh-proxycommand.1
+++ b/man/man1/monkeysphere-ssh-proxycommand.1
@@ -18,18 +18,38 @@ 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, i.e.:
 
-.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
+assumes that the keyring is kept up-to-date, in a cron job or the
+like, so that revocations are properly handled.  If the host userID is
+not found in the user's keyring, but the host is listed in the
+known_hosts file, then the keyserver is not checked.  This last policy
+might change in the future, possibly by adding a deferred check, so
+that hosts that go from non-monkeysphere-enabled to
+monkeysphere-enabled will be properly checked.
 
-.B less $(which monkeysphere-ssh-proxycommand)
+.SH ENVIRONMENT VARIABLES
+
+All environment variables defined in monkeysphere(1) can also be used
+for the proxycommand, with one note:
+
+.TP
+MONKEYSPHERE_CHECK_KEYSERVER
+Setting this variable (to `true' or `false') will override the policy
+defined in KEYSERVER CHECKING above.
 
 .SH AUTHOR
 
@@ -37,6 +57,6 @@ Written by Jameson Rollins <jrollins@fifthhorseman.net>
 
 .SH SEE ALSO
 
-.BR monkeypshere (1),
+.BR monkeysphere (1),
 .BR ssh (1),
 .BR gpg (1)