proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-04 11:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17202 from FRRouting/mergify/bp/stable/10.1/pr-17198

Browse Source 
Revert "lib: Attach stdout to child only if --log=stdout and stdout F… (backport #17198)
This commit is contained in:
Donatas Abraitis 2024-10-23 12:40:07 +03:00 committed by GitHub
commit be50cd1ee0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libfrr.c
View File

@ -1115,12 +1115,9 @@ static void frr_terminal_close(int isexit)
* don't redirect when stdout is set with --log stdout
*/
for (fd = 2; fd >= 0; fd--)
if (logging_to_stdout && isatty(fd) &&
fd == STDOUT_FILENO) {
/* Do nothing. */
} else {
if (isatty(fd) &&
(fd != STDOUT_FILENO || !logging_to_stdout))
dup2(nullfd, fd);
}
close(nullfd);
}
}
@ -1206,12 +1203,9 @@ void frr_run(struct event_loop *master)
* stdout
*/
for (fd = 2; fd >= 0; fd--)
if (logging_to_stdout && isatty(fd) &&
fd == STDOUT_FILENO) {
/* Do nothing. */
} else {
if (isatty(fd) &&
(fd != STDOUT_FILENO || !logging_to_stdout))
dup2(nullfd, fd);
}
close(nullfd);
}