upstream commit

ssh-askpass(1) is the default, overridden by SSH_ASKPASS;
 diff originally from jiri b;

1 files changed, 10 insertions, 8 deletions

diff --git a/ssh-add.1 b/ssh-add.1
index 926456f0b..f02b595d5 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ssh-add.1,v 1.61 2014/12/21 22:27:56 djm Exp $
+.\"     $OpenBSD: ssh-add.1,v 1.62 2015/03/30 18:28:37 jmc Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,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.
 .\"
-.Dd $Mdocdate: December 21 2014 $
+.Dd $Mdocdate: March 30 2015 $
 .Dt SSH-ADD 1
 .Os
 .Sh NAME
@@ -88,12 +88,11 @@ The options are as follows:
 .It Fl c
 Indicates that added identities should be subject to confirmation before
 being used for authentication.
-Confirmation is performed by the
-.Ev SSH_ASKPASS
-program mentioned below.
-Successful confirmation is signaled by a zero exit status from the
-.Ev SSH_ASKPASS
-program, rather than text entered into the requester.
+Confirmation is performed by
+.Xr ssh-askpass 1 .
+Successful confirmation is signaled by a zero exit status from
+.Xr ssh-askpass 1 ,
+rather than text entered into the requester.
 .It Fl D
 Deletes all identities from the agent.
 .It Fl d
@@ -156,6 +155,8 @@ and
 .Ev SSH_ASKPASS
 are set, it will execute the program specified by
 .Ev SSH_ASKPASS
+(by default
+.Dq ssh-askpass )
 and open an X11 window to read the passphrase.
 This is particularly useful when calling
 .Nm
@@ -197,6 +198,7 @@ is unable to contact the authentication agent.
 .Sh SEE ALSO
 .Xr ssh 1 ,
 .Xr ssh-agent 1 ,
+.Xr ssh-askpass 1 ,
 .Xr ssh-keygen 1 ,
 .Xr sshd 8
 .Sh AUTHORS