From 34738e35521f16da38ae22e149a610ce4ee466cd Mon Sep 17 00:00:00 2001 From: Philippe Guibert Date: Wed, 10 Apr 2024 14:13:54 +0200 Subject: [PATCH] bgpd: fix 'show bgp neighbors' output The 'show bgp neighbors' output appends additional lines after GR mode helpers. > # show bgp neighbors > [..] > End-of-RIB received: IPv4 VPN > Local GR Mode: Helper* > > Remote GR Mode: Helper > > R bit: True > Fix this by not appending the extra line feed. > # show bgp neighbors > [..] > End-of-RIB received: IPv4 VPN > Local GR Mode: Helper* > Remote GR Mode: Helper > R bit: True Fixes: 0e4e879b4084 ("bgpd: fix silly format string SNAFU") Signed-off-by: Philippe Guibert --- bgpd/bgp_vty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 0a1cf3362b..bcd029dcad 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -12750,7 +12750,7 @@ static void bgp_show_neighbor_graceful_restart_remote_mode(struct vty *vty, if (json) json_object_string_add(json, "remoteGrMode", mode); else - vty_out(vty, "%s\n", mode); + vty_out(vty, "%s", mode); } static void bgp_show_neighbor_graceful_restart_local_mode(struct vty *vty, @@ -12782,7 +12782,7 @@ static void bgp_show_neighbor_graceful_restart_local_mode(struct vty *vty, if (json) json_object_string_add(json, "localGrMode", mode); else - vty_out(vty, "%s\n", mode); + vty_out(vty, "%s", mode); } static void bgp_show_neighbor_graceful_restart_capability_per_afi_safi( -- 2.39.5