env_keep and env_check are also taken into account with "sudo -i".

Bug #806

diff --git a/doc/sudoers.cat b/doc/sudoers.cat
index 755364aea66a0540ddf328dfb91168f3659b466a..dd50b026c3adda8dc97ebd85545ba139c647a82a 100644 (file)
--- a/doc/sudoers.cat
+++ b/doc/sudoers.cat
@@ -186,7 +186,8 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
      (and Linux systems without PAM), the contents of _\b/_\be_\bt_\bc_\b/_\be_\bn_\bv_\bi_\br_\bo_\bn_\bm_\be_\bn_\bt are
      also included.  On BSD systems, if the _\bu_\bs_\be_\b__\bl_\bo_\bg_\bi_\bn_\bc_\bl_\ba_\bs_\bs flag is enabled,
      the _\bp_\ba_\bt_\bh and _\bs_\be_\bt_\be_\bn_\bv variables in _\b/_\be_\bt_\bc_\b/_\bl_\bo_\bg_\bi_\bn_\b._\bc_\bo_\bn_\bf are also applied.  All
-     other environment variables are removed.
+     other environment variables are removed unless permitted by _\be_\bn_\bv_\b__\bk_\be_\be_\bp or
+     _\be_\bn_\bv_\b__\bc_\bh_\be_\bc_\bk, described above.
 
      Finally, the _\br_\be_\bs_\bt_\br_\bi_\bc_\bt_\be_\bd_\b__\be_\bn_\bv_\b__\bf_\bi_\bl_\be and _\be_\bn_\bv_\b__\bf_\bi_\bl_\be files are applied, if
      present.  The variables in _\br_\be_\bs_\bt_\br_\bi_\bc_\bt_\be_\bd_\b__\be_\bn_\bv_\b__\bf_\bi_\bl_\be are applied first and are
@@ -2879,4 +2880,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.21                    September 7, 2017                   Sudo 1.8.21
+Sudo 1.8.21                   September 26, 2017                   Sudo 1.8.21

diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index e84357fc335f7da4341e7c06ed3eccd999726d0e..ae73f99a12eae38d2b9ea4400952ffc6ce815847 100644 (file)
--- a/doc/sudoers.man.in
+++ b/doc/sudoers.man.in
@@ -21,7 +21,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.TH "SUDOERS" "5" "September 7, 2017" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.TH "SUDOERS" "5" "September 26, 2017" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -480,7 +480,11 @@ and
 variables in
 \fI/etc/login.conf\fR
 are also applied.
-All other environment variables are removed.
+All other environment variables are removed unless permitted by
+\fIenv_keep\fR
+or
+\fIenv_check\fR,
+described above.
 .PP
 Finally, the
 \fIrestricted_env_file\fR

diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index 02688445270486eaffcb27116c7abbb10c520441..7549cb3c7135ff3504527bfcec0fe9bdbcf85102 100644 (file)
--- a/doc/sudoers.mdoc.in
+++ b/doc/sudoers.mdoc.in
@@ -19,7 +19,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd September 7, 2017
+.Dd September 26, 2017
 .Dt SUDOERS @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -466,7 +466,11 @@ and
 variables in
 .Pa /etc/login.conf
 are also applied.
-All other environment variables are removed.
+All other environment variables are removed unless permitted by
+.Em env_keep
+or
+.Em env_check ,
+described above.
 .Pp
 Finally, the
 .Em restricted_env_file