askpass moved from sudoers to sudo.conf in sudo 1.8.0

diff --git a/doc/UPGRADE b/doc/UPGRADE
index 0b015c2c01e92256c498138176700b31e75474b4..35ca9a5e53228c140685e2223a5a2f740e045d3c 100644 (file)
--- a/doc/UPGRADE
+++ b/doc/UPGRADE
@@ -58,6 +58,17 @@ o Upgrading from a version prior to 1.8.0:
     file in the doc directory or refer to the updated sudo manual
     to see how to configure sudo.conf.
 
+    The "askpass" setting has moved from the sudoers file to the
+    sudo.conf file.  If you have a sudoers file that uses the
+    "askpass" option, you will need to move the definition to the
+    sudo.conf file.
+
+    Old style in /etc/sudoers:
+       Defaults askpass=/usr/X11R6/bin/ssh-askpass
+
+    New style in /etc/sudo.conf:
+       Path askpass /usr/X11R6/bin/ssh-askpass
+
 o Upgrading from a version prior to 1.7.5:
 
     Sudo 1.7.5 includes an updated LDAP schema with support for

diff --git a/doc/sudoers.pod b/doc/sudoers.pod
index b883c607663a7e33f3d34e5d243bf49c8b8e39ce..12509cacb8125e0ba12ac65d257956efa1120c30 100644 (file)
--- a/doc/sudoers.pod
+++ b/doc/sudoers.pod
@@ -1356,17 +1356,6 @@ B<Strings that can be used in a boolean context>:
 
 =over 12
 
-=item askpass
-
-The I<askpass> option specifies the fully qualified path to a helper
-program used to read the user's password when no terminal is
-available.  This may be the case when B<sudo> is executed from a
-graphical (as opposed to text-based) application.  The program
-specified by I<askpass> should display the argument passed to it
-as the prompt and write the user's password to the standard output.
-The value of I<askpass> may be overridden by the C<SUDO_ASKPASS>
-environment variable.
-
 =item env_file
 
 The I<env_file> options specifies the fully qualified path to a