summaryrefslogtreecommitdiff
path: root/net/frr7/files/patch-vtysh_vtysh.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/frr7/files/patch-vtysh_vtysh.c')
-rw-r--r--net/frr7/files/patch-vtysh_vtysh.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/net/frr7/files/patch-vtysh_vtysh.c b/net/frr7/files/patch-vtysh_vtysh.c
new file mode 100644
index 000000000000..39b9e768507f
--- /dev/null
+++ b/net/frr7/files/patch-vtysh_vtysh.c
@@ -0,0 +1,22 @@
+From b727c12aabf1afc2b6e33f8590c9786e349e4fcb Mon Sep 17 00:00:00 2001
+From: Paul Manley <paul.manley@wholefoods.com>
+Date: Thu, 9 Jul 2020 11:25:34 -0500
+Subject: [PATCH] vtysh: properly exit BFD_PEER_NODE when marking file
+
+vtysh needs to be aware of how to properly exit a bfd peer when subsequent commands only succeed in a higher context.
+
+https://github.com/FRRouting/frr/issues/6511#issuecomment-656166206
+
+Signed-off-by: Paul Manley <paul.manley@wholefoods.com>
+--- vtysh/vtysh.c.orig 2020-06-30 11:08:57 UTC
++++ vtysh/vtysh.c
+@@ -809,6 +809,9 @@ int vtysh_mark_file(const char *filename)
+ } else if ((prev_node == KEYCHAIN_KEY_NODE)
+ && (tried == 1)) {
+ vty_out(vty, "exit\n");
++ } else if ((prev_node == BFD_PEER_NODE)
++ && (tried == 1)) {
++ vty_out(vty, "exit\n");
+ } else if (tried) {
+ vty_out(vty, "end\n");
+ }