Fix details of how EDITOR, VISUAL and SUDO_EDITOR are (or are not) preserved.

The description in the editor option was incorrect and didn't mention env_keep.
Reported by Sander Bos

diff --git a/doc/sudoers.cat b/doc/sudoers.cat
index 6158a08c6445e933a0b9c7f52e164f2a374f13b7..751ec09e4d2cabe087f9c8a00c55566b366c7804 100644 (file)
--- a/doc/sudoers.cat
+++ b/doc/sudoers.cat
@@ -1669,9 +1669,10 @@ S\bSU\bUD\bDO\bOE\bER\bRS\bS O\bOP\bPT\bTI\bIO\bON\bNS\bS
                        VISUAL or EDITOR environment variable if possible, or
                        the first editor in the list that exists and is
                        executable if not.  Unless invoked as s\bsu\bud\bdo\boe\bed\bdi\bit\bt, s\bsu\bud\bdo\bo
-                       does not preserve the SUDO_EDITOR, VISUAL and EDITOR
-                       environment variables by default, even when the
-                       _\be_\bn_\bv_\b__\br_\be_\bs_\be_\bt option is enabled.  The default is _\bv_\bi.
+                       does not preserve the SUDO_EDITOR, VISUAL or EDITOR
+                       environment variables unless they are present in the
+                       _\be_\bn_\bv_\b__\bk_\be_\be_\bp list or the _\be_\bn_\bv_\b__\br_\be_\bs_\be_\bt option is disabled.  The
+                       default is _\bv_\bi.
 
      iolog_dir         The top-level directory to use when constructing the
                        path name for the input/output log directory.  Only
@@ -2951,4 +2952,4 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
      file distributed with s\bsu\bud\bdo\bo or https://www.sudo.ws/license.html for
      complete details.
 
-Sudo 1.8.28                      June 19, 2019                     Sudo 1.8.28
+Sudo 1.8.28                      June 20, 2019                     Sudo 1.8.28

diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index 2f7082266f67fc00242dbf0f85f777bcb344d541..fcc7ddb54b71952507df5fd78aea67efe8a7494d 100644 (file)
--- a/doc/sudoers.man.in
+++ b/doc/sudoers.man.in
@@ -25,7 +25,7 @@
 .nr BA @BAMAN@
 .nr LC @LCMAN@
 .nr PS @PSMAN@
-.TH "SUDOERS" "@mansectform@" "June 19, 2019" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.TH "SUDOERS" "@mansectform@" "June 20, 2019" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -3453,11 +3453,13 @@ Unless invoked as
 does not preserve the
 \fRSUDO_EDITOR\fR,
 \fRVISUAL\fR
-and
+or
 \fREDITOR\fR
-environment variables by default, even when the
+environment variables unless they are present in the
+\fIenv_keep\fR
+list or the
 \fIenv_reset\fR
-option is enabled.
+option is disabled.
 The default is
 \fI@editor@\fR.
 .TP 18n

diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index 368eb3cdbc7a8a413b4570557d1e5c55d08da141..8c4e23c08c9bfb94888e8870f1b9920c78ba3442 100644 (file)
--- a/doc/sudoers.mdoc.in
+++ b/doc/sudoers.mdoc.in
@@ -24,7 +24,7 @@
 .nr BA @BAMAN@
 .nr LC @LCMAN@
 .nr PS @PSMAN@
-.Dd June 19, 2019
+.Dd June 20, 2019
 .Dt SUDOERS @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -3255,11 +3255,13 @@ Unless invoked as
 does not preserve the
 .Ev SUDO_EDITOR ,
 .Ev VISUAL
-and
+or
 .Ev EDITOR
-environment variables by default, even when the
+environment variables unless they are present in the
+.Em env_keep
+list or the
 .Em env_reset
-option is enabled.
+option is disabled.
 The default is
 .Pa @editor@ .
 .It iolog_dir

diff --git a/doc/visudo.cat b/doc/visudo.cat
index fe3be526084501afcc09a57f9ad6aa28ba2b8631..cd587c400b2d68efb7d5f4cf1cf9df18e35c7a61 100644 (file)
--- a/doc/visudo.cat
+++ b/doc/visudo.cat
@@ -32,11 +32,11 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
                v\bvi\bis\bsu\bud\bdo\bo.  v\bvi\bis\bsu\bud\bdo\bo will choose the editor that matches the user's
                SUDO_EDITOR, VISUAL or EDITOR environment variable if possible,
                or the first editor in the list that exists and is executable.
-               Note that the SUDO_EDITOR, VISUAL and EDITOR environment
-               variables are not preserved by default when the _\be_\bn_\bv_\b__\br_\be_\bs_\be_\bt
-               _\bs_\bu_\bd_\bo_\be_\br_\bs option is enabled.  The default editor path is _\bv_\bi which
-               can be set at compile time via the --with-editor configure
-               option.
+               Note that s\bsu\bud\bdo\bo does not preserve the SUDO_EDITOR, VISUAL or
+               EDITOR environment variables unless they are present in the
+               _\be_\bn_\bv_\b__\bk_\be_\be_\bp list or the _\be_\bn_\bv_\b__\br_\be_\bs_\be_\bt option is disabled in the
+               _\bs_\bu_\bd_\bo_\be_\br_\bs file.  The default editor path is _\bv_\bi which can be set
+               at compile time via the --with-editor configure option.
 
      env_editor
                If set, v\bvi\bis\bsu\bud\bdo\bo will use the value of the SUDO_EDITOR, VISUAL or

diff --git a/doc/visudo.man.in b/doc/visudo.man.in
index 746754cf7ca1a3d7b42addf98263ca68c1cdbcbc..9bdc2197967e07919e28d93c59c01f1cecb5b8a8 100644 (file)
--- a/doc/visudo.man.in
+++ b/doc/visudo.man.in
@@ -101,15 +101,20 @@ or
 \fREDITOR\fR
 environment variable if possible, or the first editor in the
 list that exists and is executable.
-Note that the
+Note that
+\fBsudo\fR
+does not preserve the
 \fRSUDO_EDITOR\fR,
 \fRVISUAL\fR
-and
+or
 \fREDITOR\fR
-environment variables are not preserved by default when the
+environment variables unless they are present in the
+\fIenv_keep\fR
+list or the
 \fIenv_reset\fR
+option is disabled in the
 \fIsudoers\fR
-option is enabled.
+file.
 The default editor path is
 \fI@editor@\fR
 which can be set at compile time via the

diff --git a/doc/visudo.mdoc.in b/doc/visudo.mdoc.in
index a9dc8ec1d7a04d2892aedc253f0d515db71d9786..20e5d63266844a316ab97e59a0d31b728342f004 100644 (file)
--- a/doc/visudo.mdoc.in
+++ b/doc/visudo.mdoc.in
@@ -99,15 +99,20 @@ or
 .Ev EDITOR
 environment variable if possible, or the first editor in the
 list that exists and is executable.
-Note that the
+Note that
+.Nm sudo
+does not preserve the
 .Ev SUDO_EDITOR ,
 .Ev VISUAL
-and
+or
 .Ev EDITOR
-environment variables are not preserved by default when the
+environment variables unless they are present in the
+.Em env_keep
+list or the
 .Em env_reset
+option is disabled in the
 .Em sudoers
-option is enabled.
+file.
 The default editor path is
 .Pa @editor@
 which can be set at compile time via the