[PATCH] incorrect path in ssh-askpass(1)

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] incorrect path in ssh-askpass(1)

Sascha Paunovic
> Synopsis: the manpage ssh-askpass(1) references a non-existent file
> Category: documentation
> Environment:
     System      : OpenBSD 6.4
     Details     : OpenBSD 6.4-current (GENERIC.MP) #393: Fri Oct 26
09:16:42 MDT 2018
             
[hidden email]:/usr/src/sys/arch/amd64/compile/GENERIC.MP

     Architecture: OpenBSD.amd64
     Machine     : amd64
> Description:
     The manpage ssh-askpass(1), in the section FILES references to
     "/etc/X11/app-defaults/SshAskpass" which doesn't exist and should be
     "/usr/X11R6/share/X11/app-defaults/SshAskpass" instead.
> How-To-Repeat:
     man 1 ssh-askpass
> Fix:
     Diff attached to this message.

xeno.diff (595 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] incorrect path in ssh-askpass(1)

Matthieu Herrb-7
On Sat, Oct 27, 2018 at 12:31:21PM +0200, Sascha Paunovic wrote:

> > Synopsis: the manpage ssh-askpass(1) references a non-existent file
> > Category: documentation
> > Environment:
>     System      : OpenBSD 6.4
>     Details     : OpenBSD 6.4-current (GENERIC.MP) #393: Fri Oct 26 09:16:42
> MDT 2018
> [hidden email]:/usr/src/sys/arch/amd64/compile/GENERIC.MP
>
>     Architecture: OpenBSD.amd64
>     Machine     : amd64
> > Description:
>     The manpage ssh-askpass(1), in the section FILES references to
>     "/etc/X11/app-defaults/SshAskpass" which doesn't exist and should be
>     "/usr/X11R6/share/X11/app-defaults/SshAskpass" instead.
> > How-To-Repeat:
>     man 1 ssh-askpass
> > Fix:
>     Diff attached to this message.

Hi,

Thanks for your report.

Stricly speaking, the application resources are searched following the
XFILESEARCHPATH variable described in the X(7) manual page.

Some commonly established usage is to let systems install the default
value in /usr, and let system administrator put locally modified
versions in /etc, and eventually have users put their own version in
${HOME}.

So I would rather use the patch below, that also replaces another
occurence of /etc/X11.

Index: x11-ssh-askpass.man.in
===================================================================
RCS file: /cvs/OpenBSD/xenocara/app/ssh-askpass/x11-ssh-askpass.man.in,v
retrieving revision 1.5
diff -u -r1.5 x11-ssh-askpass.man.in
--- x11-ssh-askpass.man.in 8 Apr 2011 20:03:47 -0000 1.5
+++ x11-ssh-askpass.man.in 27 Oct 2018 16:12:15 -0000
@@ -45,7 +45,7 @@
 .Bl -dash -offset indent
 .It
 Configurable via the standard X resource mechanisms
-.Pa /etc/X11/app-defaults ,
+.Pa /usr/X11R6/share/X11/app-defaults ,
 .Pa ~/.Xdefaults ,
 .Xr xrdb 1 ,
 etc.
@@ -285,8 +285,9 @@
 the font to use for this button label.
 .El
 .Sh FILES
-.Bl -tag -width "/etc/X11/app-defaults/SshAskpass" -compact
-.It Pa /etc/X11/app-defaults/SshAskpass
+.Bl -tag -width Ds -compact
+.It Pa /usr/X11R6/share/X11/app-defaults/SshAskpass
+The default application resources.
 .El
 .Sh SEE ALSO
 .Xr ssh 1 ,

--
Matthieu Herrb