1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115
|
From: Marc Haber <mh+debian-packages@zugschlus.de>
Date: Wed, 13 Aug 2025 10:22:56 -0700
Subject: patch docs to correct path to ssh-askpass
Forwarded: not-needed
---
docs/UPGRADE.md | 4 ++--
docs/sudo.conf.man.in | 4 ++--
docs/sudo.conf.mdoc.in | 4 ++--
docs/sudo.man.in | 2 +-
docs/sudo.mdoc.in | 2 +-
examples/sudo.conf.in | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/docs/UPGRADE.md b/docs/UPGRADE.md
index 81f7285..3252227 100644
--- a/docs/UPGRADE.md
+++ b/docs/UPGRADE.md
@@ -426,11 +426,11 @@ Notes on upgrading from an older release
Old style in `/etc/sudoers`:
- Defaults askpass=/usr/X11R6/bin/ssh-askpass
+ Defaults askpass=/usr/bin/ssh-askpass
New style in `/etc/sudo.conf`:
- Path askpass /usr/X11R6/bin/ssh-askpass
+ Path askpass /usr/bin/ssh-askpass
* Upgrading from a version prior to 1.7.5:
diff --git a/docs/sudo.conf.man.in b/docs/sudo.conf.man.in
index 7d1ae22..4f3c566 100644
--- a/docs/sudo.conf.man.in
+++ b/docs/sudo.conf.man.in
@@ -238,7 +238,7 @@ For example:
.RS 4n
Path intercept @intercept_file@
Path noexec @noexec_file@
-Path askpass /usr/X11R6/bin/ssh-askpass
+Path askpass /usr/bin/ssh-askpass
.RE
.fi
.PP
@@ -785,7 +785,7 @@ front-end configuration
# own askpass program but can use the OpenSSH askpass.
#
# Use the OpenSSH askpass
-#Path askpass /usr/X11R6/bin/ssh-askpass
+#Path askpass /usr/bin/ssh-askpass
#
# Use the Gnome OpenSSH askpass
#Path askpass /usr/libexec/openssh/gnome-ssh-askpass
diff --git a/docs/sudo.conf.mdoc.in b/docs/sudo.conf.mdoc.in
index 838f81b..0406bda 100644
--- a/docs/sudo.conf.mdoc.in
+++ b/docs/sudo.conf.mdoc.in
@@ -218,7 +218,7 @@ For example:
.Bd -literal -offset 4n
Path intercept @intercept_file@
Path noexec @noexec_file@
-Path askpass /usr/X11R6/bin/ssh-askpass
+Path askpass /usr/bin/ssh-askpass
.Ed
.Pp
If no path name is specified, features relying on the specified
@@ -716,7 +716,7 @@ front-end configuration
# own askpass program but can use the OpenSSH askpass.
#
# Use the OpenSSH askpass
-#Path askpass /usr/X11R6/bin/ssh-askpass
+#Path askpass /usr/bin/ssh-askpass
#
# Use the Gnome OpenSSH askpass
#Path askpass /usr/libexec/openssh/gnome-ssh-askpass
diff --git a/docs/sudo.man.in b/docs/sudo.man.in
index 19bd6f0..288190e 100644
--- a/docs/sudo.man.in
+++ b/docs/sudo.man.in
@@ -205,7 +205,7 @@ For example:
.sp
.RS 12n
# Path to askpass helper program
-Path askpass /usr/X11R6/bin/ssh-askpass
+Path askpass /usr/bin/ssh-askpass
.RE
.fi
.RS 8n
diff --git a/docs/sudo.mdoc.in b/docs/sudo.mdoc.in
index ae76e88..e1104da 100644
--- a/docs/sudo.mdoc.in
+++ b/docs/sudo.mdoc.in
@@ -207,7 +207,7 @@ used.
For example:
.Bd -literal -offset 4n
# Path to askpass helper program
-Path askpass /usr/X11R6/bin/ssh-askpass
+Path askpass /usr/bin/ssh-askpass
.Ed
.Pp
If no askpass program is available,
diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in
index bdd676c..847d4ab 100644
--- a/examples/sudo.conf.in
+++ b/examples/sudo.conf.in
@@ -24,7 +24,7 @@
# own askpass program but can use the OpenSSH askpass.
#
# Use the OpenSSH askpass
-#Path askpass /usr/X11R6/bin/ssh-askpass
+#Path askpass /usr/bin/ssh-askpass
#
# Use the Gnome OpenSSH askpass
#Path askpass /usr/libexec/openssh/gnome-ssh-askpass
|