mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 14:25:15 +00:00
Code Issues Releases Wiki Activity

check_foreground: use SFD_LEADER not SFD_FOLLOWER (which was closed).

Browse Source 
Also use SFD_LEADER for sudo_term_copy() in exec_pty() for consistency.
From Duncan Overbruck.
This commit is contained in:
Todd C. Miller
2023-03-22 11:21:15 -06:00
parent acbe617fb4
commit 98ec786b44
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/exec_pty.c
View File

@@ -161,7 +161,8 @@ check_foreground(struct exec_closure *ec)
if ((ret = tcgetpgrp(io_fds[SFD_USERTTY])) != -1) {
foreground = ret == ec->ppgrp;
if (foreground && !tty_initialized) {
if (sudo_term_copy(io_fds[SFD_USERTTY], io_fds[SFD_FOLLOWER]))
/* Lazily initialize the pty if needed. */
if (sudo_term_copy(io_fds[SFD_USERTTY], io_fds[SFD_LEADER]))
tty_initialized = true;
}
@@ -1233,8 +1234,8 @@ exec_pty(struct command_details *details, struct command_status *cstat)
}
if (foreground) {
/* Copy terminal attrs from user tty -> pty follower. */
if (!sudo_term_copy(io_fds[SFD_USERTTY], io_fds[SFD_FOLLOWER])) {
/* Copy terminal attrs from user tty -> pty. */
if (!sudo_term_copy(io_fds[SFD_USERTTY], io_fds[SFD_LEADER])) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_ERRNO,
"%s: unable to copy terminal settings to pty", __func__);
foreground = false;