Adjust set_logname description to new behavior when any of LOGNAME,

USER or USERNAME are preserved.

doc/sudoers.cat

@@ -1228,9 +1228,10 @@ SSUUDDOOEERRSS OOPPTTIIOONNSS
                        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 _e_n_v___r_e_s_e_t option has not been
-                       disabled, entries in the _e_n_v___k_e_e_p list will override
-                       the value of _s_e_t___l_o_g_n_a_m_e.  This flag is _o_n by default.
+                       Note that _s_e_t___l_o_g_n_a_m_e will have no effect if the
+                       _e_n_v___r_e_s_e_t option has not been disabled and the _e_n_v___k_e_e_p
+                       list contains LOGNAME, USER or USERNAME.  This flag is
+                       _o_n by default.
 
      set_utmp          When enabled, ssuuddoo will create an entry in the utmp (or
                        utmpx) file when a pseudo-tty is allocated.  A pseudo-
@@ -2463,4 +2464,4 @@ DDIISSCCLLAAIIMMEERR
      file distributed with ssuuddoo 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

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.

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.