On Fri, Mar 27, 2015 at 07:07:04PM -0400, Jiri B wrote:
> Mentioning 'ssh-askpass' is used when SSH_ASKPASS
> is not set.
> 
> j.
> 
> Index: ssh-add.1
> ===================================================================
> RCS file: /cvs/src/usr.bin/ssh/ssh-add.1,v
> retrieving revision 1.61
> diff -u -p -u -p -r1.61 ssh-add.1
> --- ssh-add.1   21 Dec 2014 22:27:56 -0000      1.61
> +++ ssh-add.1   27 Mar 2015 23:04:27 -0000
> @@ -152,11 +152,11 @@ If
>  .Nm
>  does not have a terminal associated with it but
>  .Ev DISPLAY
> -and
> +is set, it will execute the program specified by
>  .Ev SSH_ASKPASS
> -are set, it will execute the program specified by
> -.Ev SSH_ASKPASS
> -and open an X11 window to read the passphrase.
> +if not set, by default
> +.Pa ssh-askpass
> +, and open an X11 window to read the passphrase.
>  This is particularly useful when calling
>  .Nm
>  from a
> 

maybe this is clearer:

Index: ssh-add.1
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh-add.1,v
retrieving revision 1.61
diff -u -r1.61 ssh-add.1
--- ssh-add.1   21 Dec 2014 22:27:56 -0000      1.61
+++ ssh-add.1   27 Mar 2015 23:21:34 -0000
@@ -88,12 +88,11 @@
 .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 @@
 .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 @@
 .Sh SEE ALSO
 .Xr ssh 1 ,
 .Xr ssh-agent 1 ,
+.Xr ssh-askpass 1 ,
 .Xr ssh-keygen 1 ,
 .Xr sshd 8
 .Sh AUTHORS

Reply via email to