isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work around a bug on AIX where closing the pty slave causes the

Browse Source 
main sudo process to lose its controlling tty (which was *not* the
pty slave).
This commit is contained in:
Todd C. Miller
2018-07-23 11:37:26 -06:00
parent 5d31be96a7
commit dc1e0e7168
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/exec_pty.c
View File

@@ -754,9 +754,16 @@ pty_close(struct command_status *cstat)
int n; int n;
debug_decl(pty_close, SUDO_DEBUG_EXEC); debug_decl(pty_close, SUDO_DEBUG_EXEC);
/* Close the pty slave first so reads from the master don't block. */ #ifndef _AIX
if (io_fds[SFD_SLAVE] != -1) /*
* Close the pty slave first so reads from the master don't block.
* On AIX as it will cause us to lose *our* controlling tty too!
*/
if (io_fds[SFD_SLAVE] != -1) {
close(io_fds[SFD_SLAVE]); close(io_fds[SFD_SLAVE]);
io_fds[SFD_SLAVE] = -1;
}
#endif
/* Flush any remaining output (the plugin already got it). */ /* Flush any remaining output (the plugin already got it). */
if (io_fds[SFD_USERTTY] != -1) { if (io_fds[SFD_USERTTY] != -1) {
@@ -786,9 +793,13 @@ pty_close(struct command_status *cstat)
if (utmp_user != NULL) if (utmp_user != NULL)
utmp_logout(slavename, cstat->type == CMD_WSTATUS ? cstat->val : 0); utmp_logout(slavename, cstat->type == CMD_WSTATUS ? cstat->val : 0);
#ifndef _AIX
/* Close pty master. */ /* Close pty master. */
if (io_fds[SFD_MASTER] != -1) if (io_fds[SFD_MASTER] != -1) {
close(io_fds[SFD_MASTER]); close(io_fds[SFD_MASTER]);
io_fds[SFD_MASTER] = -1;
}
#endif
debug_return; debug_return;
} }