summaryrefslogtreecommitdiff
path: root/vtysh/vtysh.c
diff options
context:
space:
mode:
Diffstat (limited to 'vtysh/vtysh.c')
-rw-r--r--vtysh/vtysh.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index face057d67..19b8f2fd8b 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);