summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2018-08-08 20:52:15 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2018-08-08 20:53:27 +0200
commit572e26445a84ebaeeb3d6b2e1d908b4050f44516 (patch)
tree12b04deda7fe3cee8f1501e71a2fa1ef949930d3
parentMerge pull request #2122 from donaldsharp/zebra_nhs (diff)
downloadfrr-572e26445a84ebaeeb3d6b2e1d908b4050f44516.tar.xz
frr-572e26445a84ebaeeb3d6b2e1d908b4050f44516.zip
lib: fix "-t" command line option
was_stdio was getting set for fd == -1 (config file read), thus prematurely closing the stdio vty. Signed-off-by: David Lamparter <equinox@diac24.net>
-rw-r--r--lib/vty.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/vty.c b/lib/vty.c
index 073092dfb..87cae8773 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -2303,9 +2303,9 @@ void vty_close(struct vty *vty)
* additionally, we'd need to replace these fds with /dev/null. */
if (vty->wfd > STDERR_FILENO && vty->wfd != vty->fd)
close(vty->wfd);
- if (vty->fd > STDERR_FILENO) {
+ if (vty->fd > STDERR_FILENO)
close(vty->fd);
- } else
+ if (vty->fd == STDIN_FILENO)
was_stdio = true;
if (vty->buf)