2 files changed, 28 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 58d21ac55..c27402b5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,9 @@
       servconf.c servconf.h session.c sshconnect1.c sshd.c]
      Kerberos v5 support for SSH1, mostly from Assar Westerlund 
      <assar@freebsd.org> and Bjorn Gronvall <bg@sics.se>. markus@ ok
+   - markus@cvs.openbsd.org 2001/06/26 17:25:34
+     [ssh.1]
+     document SSH_ASKPASS; fubob@MIT.EDU
 
 20010629
  - (bal) Removed net_aton() since we don't use it any more
@@ -5886,4 +5889,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1358 2001/07/04 04:21:14 mouring Exp $
+$Id: ChangeLog,v 1.1359 2001/07/04 04:31:38 mouring Exp $
diff --git a/ssh.1 b/ssh.1
index f56b330f1..05112812c 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.117 2001/06/23 17:48:19 itojun Exp $
+.\" $OpenBSD: ssh.1,v 1.118 2001/06/26 17:25:34 markus Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -1138,6 +1138,29 @@ Set to the default
 .Ev PATH ,
 as specified when compiling
 .Nm ssh .
+.It Ev SSH_ASKPASS
+If
+.Nm
+needs a passphrase, it will read the passphrase from the current
+terminal if it was run from a terminal.
+If
+.Nm
+does not have a terminal associated with it but
+.Ev DISPLAY
+and
+.Ev SSH_ASKPASS
+are set, it will execute the program specified by
+.Ev SSH_ASKPASS
+and open an X11 window to read the passphrase.
+This is particularly useful when calling
+.Nm
+from a
+.Pa .Xsession
+or related script.
+(Note that on some machines it
+may be necessary to redirect the input from
+.Pa /dev/null
+to make this work.)
 .It Ev SSH_AUTH_SOCK
 indicates the path of a unix-domain socket used to communicate with the
 agent.