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

get_user_info: pass sudo_get_ttysize() the fd of /dev/tty, not stderr.

Browse Source 
Both the plugin API and the main event loop expect lines/cols to
refer to the user's terminal, so using /dev/tty is better here.
This commit is contained in:
Todd C. Miller
2023-04-16 16:05:15 -06:00
parent cc22cca34f
commit d1912957ae
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sudo.c
View File

@@ -533,6 +533,7 @@ get_user_info(struct user_details *ud)
ud->pgid = getpgid(0); ud->pgid = getpgid(0);
fd = open(_PATH_TTY, O_RDWR); fd = open(_PATH_TTY, O_RDWR);
if (fd != -1) { if (fd != -1) {
sudo_get_ttysize(fd, &ud->ts_rows, &ud->ts_cols);
if ((ud->tcpgid = tcgetpgrp(fd)) == -1) if ((ud->tcpgid = tcgetpgrp(fd)) == -1)
ud->tcpgid = 0; ud->tcpgid = 0;
close(fd); close(fd);
@@ -623,7 +624,6 @@ get_user_info(struct user_details *ud)
goto oom; goto oom;
ud->host = info[i] + sizeof("host=") - 1; ud->host = info[i] + sizeof("host=") - 1;
sudo_get_ttysize(STDERR_FILENO, &ud->ts_rows, &ud->ts_cols);
if (asprintf(&info[++i], "lines=%d", ud->ts_rows) == -1) if (asprintf(&info[++i], "lines=%d", ud->ts_rows) == -1)
goto oom; goto oom;
if (asprintf(&info[++i], "cols=%d", ud->ts_cols) == -1) if (asprintf(&info[++i], "cols=%d", ud->ts_cols) == -1)