Document that the values printed by "sudo -V" are affected by

Defaults settings in sudoers.

diff --git a/doc/sudoers.cat b/doc/sudoers.cat
index cbf478fde2407ed2b015f27772ec23eea320ee54..4714451d39853bc712ef9abde516316f2797ff10 100644 (file)
--- a/doc/sudoers.cat
+++ b/doc/sudoers.cat
@@ -924,12 +924,12 @@ S\bSU\bUD\bDO\bOE\bER\bRS\bS O\bOP\bPT\bTI\bIO\bON\bNS\bS
                        Any variables in the caller's environment that match
                        the env_keep and env_check lists are then added,
                        followed by any variables present in the file specified
-                       by the _\be_\bn_\bv_\b__\bf_\bi_\bl_\be option (if any).  The default contents
-                       of the env_keep and env_check lists are displayed when
-                       s\bsu\bud\bdo\bo is run by root with the -\b-V\bV option.  If the
-                       _\bs_\be_\bc_\bu_\br_\be_\b__\bp_\ba_\bt_\bh option is set, its value will be used for
-                       the PATH environment variable.  This flag is _\bo_\bn by
-                       default.
+                       by the _\be_\bn_\bv_\b__\bf_\bi_\bl_\be option (if any).  The contents of the
+                       env_keep and env_check lists, as modified by global
+                       Defaults parameters in _\bs_\bu_\bd_\bo_\be_\br_\bs, are displayed when s\bsu\bud\bdo\bo
+                       is run by root with the -\b-V\bV option.  If the _\bs_\be_\bc_\bu_\br_\be_\b__\bp_\ba_\bt_\bh
+                       option is set, its value will be used for the PATH
+                       environment variable.  This flag is _\bo_\bn by default.
 
      fast_glob         Normally, s\bsu\bud\bdo\bo uses the glob(3) function to do shell-
                        style globbing when matching path names.  However,
@@ -1708,7 +1708,7 @@ S\bSU\bUD\bDO\bOE\bER\bRS\bS O\bOP\bPT\bTI\bIO\bON\bNS\bS
                        Regardless of whether the env_reset option is enabled
                        or disabled, variables specified by env_check will be
                        preserved in the environment if they pass the
-                       aforementioned check.  The default list of environment
+                       aforementioned check.  The global list of environment
                        variables to check is displayed when s\bsu\bud\bdo\bo is run by
                        root with the -\b-V\bV option.
 
@@ -1718,7 +1718,7 @@ S\bSU\bUD\bDO\bOE\bER\bRS\bS O\bOP\bPT\bTI\bIO\bON\bNS\bS
                        list or a single value without double-quotes.  The list
                        can be replaced, added to, deleted from, or disabled by
                        using the =, +=, -=, and ! operators respectively.  The
-                       default list of environment variables to remove is
+                       global list of environment variables to remove is
                        displayed when s\bsu\bud\bdo\bo is run by root with the -\b-V\bV option.
                        Note that many operating systems will remove
                        potentially dangerous variables from the environment of
@@ -1731,7 +1731,7 @@ S\bSU\bUD\bDO\bOE\bER\bRS\bS O\bOP\bPT\bTI\bIO\bON\bNS\bS
                        be a double-quoted, space-separated list or a single
                        value without double-quotes.  The list can be replaced,
                        added to, deleted from, or disabled by using the =, +=,
-                       -=, and ! operators respectively.  The default list of
+                       -=, and ! operators respectively.  The global list of
                        variables to keep is displayed when s\bsu\bud\bdo\bo is run by root
                        with the -\b-V\bV option.
 

diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index 298a33a70526a2f9eb1908f6d843e057d3983c30..bbf81c3cd9042966907600ec9bd03f418093f1fe 100644 (file)
--- a/doc/sudoers.man.in
+++ b/doc/sudoers.man.in
@@ -2001,11 +2001,13 @@ lists are then added, followed by any variables present in the file
 specified by the
 \fIenv_file\fR
 option (if any).
-The default contents of the
+The contents of the
 \fRenv_keep\fR
 and
 \fRenv_check\fR
-lists are displayed when
+lists, as modified by global Defaults parameters in
+\fIsudoers\fR,
+are displayed when
 \fBsudo\fR
 is run by root with the
 \fB\-V\fR
@@ -3524,7 +3526,7 @@ Regardless of whether the
 option is enabled or disabled, variables specified by
 \fRenv_check\fR
 will be preserved in the environment if they pass the aforementioned check.
-The default list of environment variables to check is displayed when
+The global list of environment variables to check is displayed when
 \fBsudo\fR
 is run by root with
 the
@@ -3545,7 +3547,7 @@ The list can be replaced, added to, deleted from, or disabled by using the
 and
 \fR\&!\fR
 operators respectively.
-The default list of environment variables to remove is displayed when
+The global list of environment variables to remove is displayed when
 \fBsudo\fR
 is run by root with the
 \fB\-V\fR
@@ -3570,7 +3572,7 @@ The list can be replaced, added to, deleted from, or disabled by using the
 and
 \fR\&!\fR
 operators respectively.
-The default list of variables to keep
+The global list of variables to keep
 is displayed when
 \fBsudo\fR
 is run by root with the

diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index cd8d6c7b062b0c465b115cd6295af67ab77355c6..6e9aa8395fe42b11fd82d8e31796ae70ed3af670 100644 (file)
--- a/doc/sudoers.mdoc.in
+++ b/doc/sudoers.mdoc.in
@@ -1866,11 +1866,13 @@ lists are then added, followed by any variables present in the file
 specified by the
 .Em env_file
 option (if any).
-The default contents of the
+The contents of the
 .Li env_keep
 and
 .Li env_check
-lists are displayed when
+lists, as modified by global Defaults parameters in
+.Em sudoers ,
+are displayed when
 .Nm sudo
 is run by root with the
 .Fl V
@@ -3272,7 +3274,7 @@ Regardless of whether the
 option is enabled or disabled, variables specified by
 .Li env_check
 will be preserved in the environment if they pass the aforementioned check.
-The default list of environment variables to check is displayed when
+The global list of environment variables to check is displayed when
 .Nm sudo
 is run by root with
 the
@@ -3291,7 +3293,7 @@ The list can be replaced, added to, deleted from, or disabled by using the
 and
 .Li \&!
 operators respectively.
-The default list of environment variables to remove is displayed when
+The global list of environment variables to remove is displayed when
 .Nm sudo
 is run by root with the
 .Fl V
@@ -3315,7 +3317,7 @@ The list can be replaced, added to, deleted from, or disabled by using the
 and
 .Li \&!
 operators respectively.
-The default list of variables to keep
+The global list of variables to keep
 is displayed when
 .Nm sudo
 is run by root with the