diff -up ./doc/sudoers.cat.manpage ./doc/sudoers.cat

--- ./doc/sudoers.cat.manpage	2017-09-11 15:16:47.443869930 +0200

+++ ./doc/sudoers.cat	2017-09-11 15:42:15.140500826 +0200

@@ -1088,13 +1088,19 @@ S?SU?UD?DO?OE?ER?RS?S O?OP?PT?TI?IO?ON?N

                        connected to the user's tty, due to I/O redirection or

                        because the command is part of a pipeline, that input

                        is also captured and stored in a separate log file.

-                       For more information, see the _?I_?/_?O _?L_?O_?G _?F_?I_?L_?E_?S section.

-                       This flag is _?o_?f_?f by default.

+                       Anything sent to the standard input will be consumed,

+                       regardless of whether or not the command run via s?su?ud?do?o

+                       is actually reading the standard input.  This may have

+                       unexpected results when using s?su?ud?do?o in a shell script

+                       that expects to process the standard input.  For more

+                       information about I/O logging, see the _?I_?/_?O _?L_?O_?G _?F_?I_?L_?E_?S

+                       section.  This flag is _?o_?f_?f by default.

      log_output        If set, s?su?ud?do?o will run the command in a pseudo-tty and

                        log all output that is sent to the screen, similar to

-                       the script(1) command.  For more information, see the

-                       _?I_?/_?O _?L_?O_?G _?F_?I_?L_?E_?S section.  This flag is _?o_?f_?f by default.

+                       the script(1) command.  For more information about I/O

+                       logging, see the _?I_?/_?O _?L_?O_?G _?F_?I_?L_?E_?S section.  This flag is

+                       _?o_?f_?f by default.

      log_year          If set, the four-digit year will be logged in the (non-

                        syslog) s?su?ud?do?o log file.  This flag is _?o_?f_?f by default.

@@ -1396,13 +1402,18 @@ S?SU?UD?DO?OE?ER?RS?S O?OP?PT?TI?IO?ON?N

                        not needed, this option can be disabled to reduce the

                        load on the LDAP server.  This flag is _?o_?n by default.

-     use_pty           If set, s?su?ud?do?o will run the command in a pseudo-pty even

-                       if no I/O logging is being gone.  A malicious program

-                       run under s?su?ud?do?o could conceivably fork a background

-                       process that retains to the user's terminal device

-                       after the main program has finished executing.  Use of

-                       this option will make that impossible.  This flag is

-                       _?o_?f_?f by default.

+     use_pty           If set, and s?su?ud?do?o is running in a terminal, the command

+                       will be run in a pseudo-pty (even if no I/O logging is

+                       being done).  If the s?su?ud?do?o process is not attached to a

+                       terminal, _?u_?s_?e_?__?p_?t_?y has no effect.

+

+                       A malicious program run under s?su?ud?do?o may be capable of

+                       injecting injecting commands into the user's terminal

+                       or running a background process that retains access to

+                       the user's terminal device even after the main program

+                       has finished executing.  By running the command in a

+                       separate pseudo-pty, this attack is no longer possible.

+                       This flag is _?o_?f_?f by default.

      utmp_runas        If set, s?su?ud?do?o will store the name of the runas user when

                        updating the utmp (or utmpx) file.  By default, s?su?ud?do?o

@@ -2135,11 +2146,11 @@ L?LO?OG?G F?FO?OR?RM?MA?AT?T

 I?I/?/O?O L?LO?OG?G F?FI?IL?LE?ES?S

      When I/O logging is enabled, s?su?ud?do?o will run the command in a pseudo-tty

-     and log all user input and/or output.  I/O is logged to the directory

-     specified by the _?i_?o_?l_?o_?g_?__?d_?i_?r option (_?/_?v_?a_?r_?/_?l_?o_?g_?/_?s_?u_?d_?o_?-_?i_?o by default) using a

-     unique session ID that is included in the s?su?ud?do?o log line, prefixed with

-     ``TSID=''.  The _?i_?o_?l_?o_?g_?__?f_?i_?l_?e option may be used to control the format of

-     the session ID.

+     and log all user input and/or output, depending on which options are

+     are enabled. I/O is logged to the directory specified by the _?i_?o_?l_?o_?g_?__?d_?i_?r 

+     option (_?/_?v_?a_?r_?/_?l_?o_?g_?/_?s_?u_?d_?o_?-_?i_?o by default) using a unique session ID that is 

+     included in the s?su?ud?do?o log line, prefixed with "TSID=". The _?i_?o_?l_?o_?g_?__?f_?i_?l_?e

+     option may be used to control the format of the session ID.

      Each I/O log is stored in a separate directory that contains the

      following files:

diff -up ./doc/sudoers.man.in.manpage ./doc/sudoers.man.in

--- ./doc/sudoers.man.in.manpage	2017-09-11 15:16:47.444869925 +0200

+++ ./doc/sudoers.man.in	2017-09-11 15:16:47.456869864 +0200

@@ -2300,7 +2300,14 @@ will run the command in a pseudo-tty and

 If the standard input is not connected to the user's tty, due to

 I/O redirection or because the command is part of a pipeline, that

 input is also captured and stored in a separate log file.

-For more information, see the

+Anything sent to the standard input will be consumed, regardless of

+whether or not the command run via

+\fBsudo\fR

+is actually reading the standard input.

+This may have unexpected results when using

+\fBsudo\fR

+in a shell script that expects to process the standard input.

+For more information about I/O logging, see the

 \fII/O LOG FILES\fR

 section.

 This flag is

@@ -2314,7 +2321,7 @@ will run the command in a pseudo-tty and

 to the screen, similar to the

 script(1)

 command.

-For more information, see the

+For more information about I/O logging, see the

 \fII/O LOG FILES\fR

 section.

 This flag is

@@ -2934,14 +2941,24 @@ This flag is

 by default.

 .TP 18n

 use_pty

-If set,

+If set, and

 \fBsudo\fR

-will run the command in a pseudo-pty even if no I/O logging is being gone.

+is running in a terminal, the command will be run in a pseudo-pty

+(even if no I/O logging is being done).

+If the

+\fBsudo\fR

+process is not attached to a terminal,

+\fIuse_pty\fR

+has no effect.

+.sp

 A malicious program run under

 \fBsudo\fR

-could conceivably fork a background process that retains to the user's

-terminal device after the main program has finished executing.

-Use of this option will make that impossible.

+may be capable of injecting injecting commands into the user's

+terminal or running a background process that retains access to the

+user's terminal device even after the main program has finished

+executing.

+By running the command in a separate pseudo-pty, this attack is

+no longer possible.

 This flag is

 \fIoff\fR

 by default.

@@ -4281,7 +4298,8 @@ word wrap will be disabled.

 .SH "I/O LOG FILES"

 When I/O logging is enabled,

 \fBsudo\fR

-will run the command in a pseudo-tty and log all user input and/or output.

+will run the command in a pseudo-tty and log all user input and/or output,

+depending on which options are enabled.

 I/O is logged to the directory specified by the

 \fIiolog_dir\fR

 option

diff -up ./doc/sudoers.mdoc.in.manpage ./doc/sudoers.mdoc.in

--- ./doc/sudoers.mdoc.in.manpage	2017-09-11 15:16:47.445869920 +0200

+++ ./doc/sudoers.mdoc.in	2017-09-11 15:16:47.456869864 +0200

@@ -2155,7 +2155,14 @@ will run the command in a pseudo-tty and

 If the standard input is not connected to the user's tty, due to

 I/O redirection or because the command is part of a pipeline, that

 input is also captured and stored in a separate log file.

-For more information, see the

+Anything sent to the standard input will be consumed, regardless of

+whether or not the command run via

+.Nm sudo

+is actually reading the standard input.

+This may have unexpected results when using

+.Nm sudo

+in a shell script that expects to process the standard input.

+For more information about I/O logging, see the

 .Sx "I/O LOG FILES"

 section.

 This flag is

@@ -2168,7 +2175,7 @@ will run the command in a pseudo-tty and

 to the screen, similar to the

 .Xr script 1

 command.

-For more information, see the

+For more information about I/O logging, see the

 .Sx "I/O LOG FILES"

 section.

 This flag is

@@ -2752,14 +2759,24 @@ This flag is

 .Em on

 by default.

 .It use_pty

-If set,

+If set, and

 .Nm sudo

-will run the command in a pseudo-pty even if no I/O logging is being gone.

+is running in a terminal, the command will be run in a pseudo-pty

+(even if no I/O logging is being done).

+If the

+.Nm sudo

+process is not attached to a terminal,

+.Em use_pty

+has no effect.

+.Pp

 A malicious program run under

 .Nm sudo

-could conceivably fork a background process that retains to the user's

-terminal device after the main program has finished executing.

-Use of this option will make that impossible.

+may be capable of injecting injecting commands into the user's

+terminal or running a background process that retains access to the

+user's terminal device even after the main program has finished

+executing.

+By running the command in a separate pseudo-pty, this attack is

+no longer possible.

 This flag is

 .Em off

 by default.

@@ -3976,7 +3993,8 @@ word wrap will be disabled.

 .Sh I/O LOG FILES

 When I/O logging is enabled,

 .Nm sudo

-will run the command in a pseudo-tty and log all user input and/or output.

+will run the command in a pseudo-tty and log all user input and/or output,

+depending on which options are enabled.

 I/O is logged to the directory specified by the

 .Em iolog_dir

 option