Adjust set_logname description to new behavior when any of LOGNAME,

USER or USERNAME are preserved.

diff --git a/doc/sudoers.cat b/doc/sudoers.cat
index 889f1b02de095bd9f2e07a037631d5766d03caff..40e608835485bfd1bde042f22fd1f564e20ea70a 100644 (file)
--- a/doc/sudoers.cat
+++ b/doc/sudoers.cat
@@ -1228,9 +1228,10 @@ S\bSU\bUD\bDO\bOE\bER\bRS\bS O\bOP\bPT\bTI\bIO\bON\bNS\bS
                        system) use LOGNAME to determine the real identity of
                        the user, it may be desirable to change this behavior.
                        This can be done by negating the set_logname option.
-                       Note that if the _\be_\bn_\bv_\b__\br_\be_\bs_\be_\bt option has not been
-                       disabled, entries in the _\be_\bn_\bv_\b__\bk_\be_\be_\bp list will override
-                       the value of _\bs_\be_\bt_\b__\bl_\bo_\bg_\bn_\ba_\bm_\be.  This flag is _\bo_\bn by default.
+                       Note that _\bs_\be_\bt_\b__\bl_\bo_\bg_\bn_\ba_\bm_\be will have no effect if the
+                       _\be_\bn_\bv_\b__\br_\be_\bs_\be_\bt option has not been disabled and the _\be_\bn_\bv_\b__\bk_\be_\be_\bp
+                       list contains LOGNAME, USER or USERNAME.  This flag is
+                       _\bo_\bn by default.
 
      set_utmp          When enabled, s\bsu\bud\bdo\bo will create an entry in the utmp (or
                        utmpx) file when a pseudo-tty is allocated.  A pseudo-
@@ -2463,4 +2464,4 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
      file distributed with s\bsu\bud\bdo\bo or http://www.sudo.ws/license.html for
      complete details.
 
-Sudo 1.8.15                   September 21, 2015                   Sudo 1.8.15
+Sudo 1.8.15                   September 25, 2015                   Sudo 1.8.15

diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index dec03593825ac85ec5f54b38d010af062a227205..6e038867a1c1547ddfdc072c07a609906eb5f169 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 21, 2015" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.TH "SUDOERS" "5" "September 25, 2015" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -2613,12 +2613,18 @@ However, since some programs (including the RCS revision control system) use
 to determine the real identity of the user, it may be desirable to
 change this behavior.
 This can be done by negating the set_logname option.
-Note that if the
+Note that
+\fIset_logname\fR
+will have no effect
+if the
 \fIenv_reset\fR
-option has not been disabled, entries in the
+option has not been disabled and the
 \fIenv_keep\fR
-list will override the value of
-\fIset_logname\fR.
+list contains
+\fRLOGNAME\fR,
+\fRUSER\fR
+or
+\fRUSERNAME\fR.
 This flag is
 \fIon\fR
 by default.

diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index 2dd8b2368271c4c5620ff8a806269f37c32fd727..56da957917a870ce462f7231386ec09764db10bd 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 21, 2015
+.Dd September 25, 2015
 .Dt SUDOERS @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -2454,12 +2454,18 @@ However, since some programs (including the RCS revision control system) use
 to determine the real identity of the user, it may be desirable to
 change this behavior.
 This can be done by negating the set_logname option.
-Note that if the
+Note that
+.Em set_logname
+will have no effect
+if the
 .Em env_reset
-option has not been disabled, entries in the
+option has not been disabled and the
 .Em env_keep
-list will override the value of
-.Em set_logname .
+list contains
+.Ev LOGNAME ,
+.Ev USER
+or
+.Ev USERNAME .
 This flag is
 .Em on
 by default.