Fix documentation bug, the contents of env_file have never been

subject to env_keep or env_check.  However, variables are only added
if they have not already been preserved.

diff --git a/doc/sudoers.cat b/doc/sudoers.cat
index 0461e8832a05a3c7b34e7043dd5a15bf284c0c4c..ffad399c187e178064252d007aca6716f7110e2d 100644 (file)
--- a/doc/sudoers.cat
+++ b/doc/sudoers.cat
@@ -1719,8 +1719,10 @@ S\bSU\bUD\bDO\bOE\bER\bRS\bS O\bOP\bPT\bTI\bIO\bON\bNS\bS
                    be of the form ``VARIABLE=value'' or ``export
                    VARIABLE=value''.  The value may optionally be surrounded
                    by single or double quotes.  Variables in this file are
-                   subject to other s\bsu\bud\bdo\bo environment settings such as _\be_\bn_\bv_\b__\bk_\be_\be_\bp
-                   and _\be_\bn_\bv_\b__\bc_\bh_\be_\bc_\bk.
+                   only added if the variable does not already exist in the
+                   environment.  This file is considered to be part of the
+                   security policy, its contents are not subject to other s\bsu\bud\bdo\bo
+                   environment restrictions such as _\be_\bn_\bv_\b__\bk_\be_\be_\bp and _\be_\bn_\bv_\b__\bc_\bh_\be_\bc_\bk.
 
      exempt_group  Users in this group are exempt from password and PATH
                    requirements.  The group name specified should not include

diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index 29abf4cbeb44e6793514fcebcf5320098ebeb432..bae06012ce9981e9e692ce4fb45f3e6603f561c2 100644 (file)
--- a/doc/sudoers.man.in
+++ b/doc/sudoers.man.in
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!
 .\" IT IS GENERATED AUTOMATICALLY FROM sudoers.mdoc.in
 .\"
-.\" Copyright (c) 1994-1996, 1998-2005, 2007-2016
+.\" Copyright (c) 1994-1996, 1998-2005, 2007-2017
 .\"    Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -3468,9 +3468,12 @@ Entries in this file should either be of the form
 or
 \(Lq\fRexport VARIABLE=value\fR\(Rq.
 The value may optionally be surrounded by single or double quotes.
-Variables in this file are subject to other
+Variables in this file are only added if the variable does not already
+exist in the environment.
+This file is considered to be part of the security policy,
+its contents are not subject to other
 \fBsudo\fR
-environment settings such as
+environment restrictions such as
 \fIenv_keep\fR
 and
 \fIenv_check\fR.

diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index 6bfe868d5b4729c4de5f38368df40ab5806b963e..4a9508d8fe91b28651f2a22047a77c8081126efa 100644 (file)
--- a/doc/sudoers.mdoc.in
+++ b/doc/sudoers.mdoc.in
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1994-1996, 1998-2005, 2007-2016
+.\" Copyright (c) 1994-1996, 1998-2005, 2007-2017
 .\"    Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -3239,9 +3239,12 @@ Entries in this file should either be of the form
 or
 .Dq Li export VARIABLE=value .
 The value may optionally be surrounded by single or double quotes.
-Variables in this file are subject to other
+Variables in this file are only added if the variable does not already
+exist in the environment.
+This file is considered to be part of the security policy,
+its contents are not subject to other
 .Nm sudo
-environment settings such as
+environment restrictions such as
 .Em env_keep
 and
 .Em env_check .