Merge pull request #17203 from FRRouting/mergify/bp/stable/10.0/pr-17198

Revert "lib: Attach stdout to child only if --log=stdout and stdout F… (backport #17198)

Author: ton31337

lib/libfrr.c

@@ -1110,12 +1110,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);
 	}
 }
@@ -1201,12 +1198,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);
 		}