diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 12:28:12 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 12:28:12 +0200 |
| commit | 57463530f3f8b687f238bc76020c0f168b19f0a8 (patch) | |
| tree | 820493847a8e55e5ceaa0742e996ae55bd49b7e0 /vtysh | |
| parent | Merge branch 'frr/pull/546' ("bgpd: resolve issue with sending vpn labels") (diff) | |
| parent | Merge branch 'frr/pull/575' (diff) | |
| download | frr-57463530f3f8b687f238bc76020c0f168b19f0a8.tar.xz frr-57463530f3f8b687f238bc76020c0f168b19f0a8.zip | |
Merge branch 'stable/3.0'
Conflicts:
ospf6d/ospf6_lsa.c
ospfd/ospf_vty.c
zebra/interface.c
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'vtysh')
| -rw-r--r-- | vtysh/vtysh.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index face057d6..19b8f2fd8 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -323,7 +323,11 @@ vtysh_execute_func (const char *line, int pager) { vtysh_execute("exit-vnc"); } - else if ((saved_node == KEYCHAIN_KEY_NODE) && (tried == 1)) + else if ((saved_node == KEYCHAIN_KEY_NODE + || saved_node == LDP_PSEUDOWIRE_NODE + || saved_node == LDP_IPV4_IFACE_NODE + || saved_node == LDP_IPV6_IFACE_NODE) + && (tried == 1)) { vtysh_execute("exit"); } @@ -641,7 +645,7 @@ vtysh_mark_file (const char *filename) } } /* This is the end */ - fprintf(stdout, "end\n"); + fprintf(stdout, "\nend\n"); vty_close(vty); XFREE(MTYPE_VTYSH_CMD, vty_buf_copy); |