fixing return code error in openpgp2ssh, preparing for new release.

[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 c4196f2b4afbd392272e8dffa40856ec6ebcb9a9..a31a9d1598b7f671dce9dca6916be9faed6275b9 100644 (file)
--- a/man/man1/monkeysphere-ssh-proxycommand.1
+++ b/man/man1/monkeysphere-ssh-proxycommand.1
@@ -19,7 +19,7 @@ or by adding the following line to your ~/.ssh/config script:
 .B ProxyCommand monkeysphere-ssh-proxycommand %h %p
 
 The script can easily be incorporated into other ProxyCommand scripts
 .B ProxyCommand monkeysphere-ssh-proxycommand %h %p
 
 The script can easily be incorporated into other ProxyCommand scripts

-by calling it with the "--no-connect" option, ie:
+by calling it with the "--no-connect" option, i.e.:

 
 .B monkeysphere-ssh-proxycommand --no-connect "$HOST" "$PORT"
 
 
 .B monkeysphere-ssh-proxycommand --no-connect "$HOST" "$PORT"
 


@@ -32,15 +32,24 @@ 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
 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.
+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.

 
 .SH ENVIRONMENT VARIABLES
 
 
 .SH ENVIRONMENT VARIABLES
 

+All environment variables defined in monkeysphere(1) can also be used
+for the proxycommand, with one note:
+

 .TP
 .TP

-KEYSERVER The keyserver to query.
+MONKEYSPHERE_CHECK_KEYSERVER
+Setting this variable (to `true' or `false') will override the policy
+defined in KEYSERVER CHECKING above.

 
 .SH AUTHOR
 
 
 .SH AUTHOR
 


@@ -48,6 +57,6 @@ Written by Jameson Rollins <jrollins@fifthhorseman.net>
 
 .SH SEE ALSO
 
 
 .SH SEE ALSO
 

-.BR monkeypshere (1),
+.BR monkeysphere (1),

 .BR ssh (1),
 .BR gpg (1)
 .BR ssh (1),
 .BR gpg (1)