From c9c8d0d189ce58e3dd6611a1cf6e566806f137cc Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 3 Aug 2017 03:37:37 +0200 Subject: [PATCH] lib: close stdin/out/err in non-terminal case Oops, forgot this path... in the --terminal case, stdio is closed when the user ends the terminal session, but without terminal it was left open. (This caused a ssh session hang in the CentOS6 CI because the file descriptors were still open, so ssh would keep the session alive...) Signed-off-by: David Lamparter --- lib/libfrr.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/libfrr.c b/lib/libfrr.c index 55d7784752..aa21a143ba 100644 --- a/lib/libfrr.c +++ b/lib/libfrr.c @@ -688,8 +688,15 @@ void frr_run(struct thread_master *master) thread_add_read(master, frr_daemon_ctl, NULL, daemon_ctl_sock, &daemon_ctl_thread); } - } else if (daemon_ctl_sock != -1) { - close(daemon_ctl_sock); + } else { + int nullfd = open("/dev/null", O_RDONLY | O_NOCTTY); + dup2(nullfd, 0); + dup2(nullfd, 1); + dup2(nullfd, 2); + close(nullfd); + + if (daemon_ctl_sock != -1) + close(daemon_ctl_sock); daemon_ctl_sock = -1; } -- 2.39.5