Re: ssh-add.1 / ssh-askpass clarification

2015-03-28 Thread Jiri B
On Sat, Mar 28, 2015 at 07:19:13AM +, Jason McIntyre wrote:
   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 -  1.61
   +++ ssh-add.1 27 Mar 2015 23:21:34 -
   @@ -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
 

 [...]
 
 currently the doc (specifically -c) refers to SSH_ASKPASS. i understand
 you want to be clear that SSH_ASKPASS does not need to be set, so you
 added some text to say that explicitly.
 
 my diff takes a different approach - it is actually not that common to
 talk about the environment variable when a sane default exists. usually
 we document the usual case and in ENVIRONMENT we document the variable
 that can override defualt behaviour. my diff does that.

I'm OK with this.

j.



Re: ssh-add.1 / ssh-askpass clarification

2015-03-28 Thread Jason McIntyre
On Fri, Mar 27, 2015 at 08:04:08PM -0400, Jiri B wrote:
 On Fri, Mar 27, 2015 at 11:22:07PM +, Jason McIntyre wrote:
  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 -  1.61
   +++ ssh-add.1   27 Mar 2015 23:04:27 -
   @@ -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 -  1.61
  +++ ssh-add.1   27 Mar 2015 23:21:34 -
  @@ -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
 
 IIUC the point is SSH_ASKPASS does not need to be set, if not set
 it falls back to /usr/X11R6/bin/ssh-askpass. But I can be wrong.
 
 j.
 

i'm sorry, but i don;t see exactly the issue.

currently the doc (specifically -c) refers to SSH_ASKPASS. i understand
you want to be clear that SSH_ASKPASS does not need to be set, so you
added some text to say that explicitly.

my diff takes a different approach - it is actually not that common to
talk about the environment variable when a sane default exists. usually
we document the usual case and in ENVIRONMENT we document the variable
that can override defualt behaviour. my diff does that.

have i misunderstood something?

jmc



ssh-add.1 / ssh-askpass clarification

2015-03-27 Thread Jiri B
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 -  1.61
+++ ssh-add.1   27 Mar 2015 23:04:27 -
@@ -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



Re: ssh-add.1 / ssh-askpass clarification

2015-03-27 Thread Jason McIntyre
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 -  1.61
 +++ ssh-add.1   27 Mar 2015 23:04:27 -
 @@ -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 -  1.61
+++ ssh-add.1   27 Mar 2015 23:21:34 -
@@ -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



Re: ssh-add.1 / ssh-askpass clarification

2015-03-27 Thread Jiri B
On Fri, Mar 27, 2015 at 11:22:07PM +, Jason McIntyre wrote:
 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 -  1.61
  +++ ssh-add.1   27 Mar 2015 23:04:27 -
  @@ -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 -  1.61
 +++ ssh-add.1 27 Mar 2015 23:21:34 -
 @@ -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

IIUC the point is SSH_ASKPASS does not need to be set, if not set
it falls back to /usr/X11R6/bin/ssh-askpass. But I can be wrong.

j.