*: remove cmd_node->vtysh

The only nodes that have this as 0 don't have a "->func" anyway, so the
entire thing is really just pointless.

Signed-off-by: David Lamparter <equinox@diac24.net>

53 files changed, 1 insertions, 98 deletions

diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c
index a009af320..ee7a06c8a 100644
--- a/babeld/babel_interface.c
+++ b/babeld/babel_interface.c
@@ -61,7 +61,6 @@ static vector babel_enable_if;                 /* enable interfaces (by cmd). */
 static struct cmd_node babel_interface_node = {
     .node = INTERFACE_NODE,
     .prompt = "%s(config-if)# ",
-    .vtysh = 1,
 };
 
 
diff --git a/babeld/babeld.c b/babeld/babeld.c
index a7a348199..6d853c527 100644
--- a/babeld/babeld.c
+++ b/babeld/babeld.c
@@ -73,7 +73,6 @@ static struct cmd_node cmd_babel_node =
 {
     .node   = BABEL_NODE,
     .prompt = "%s(config-router)# ",
-    .vtysh  = 1,
 };
 
 /* print current babel configuration on vty */
diff --git a/bfdd/bfdd_vty.c b/bfdd/bfdd_vty.c
index fddefb750..ee0898d86 100644
--- a/bfdd/bfdd_vty.c
+++ b/bfdd/bfdd_vty.c
@@ -888,13 +888,11 @@ DEFUN_NOSH(show_debugging_bfd,
 struct cmd_node bfd_node = {
 	.node = BFD_NODE,
 	.prompt = "%s(config-bfd)# ",
-	.vtysh = 1,
 };
 
 struct cmd_node bfd_peer_node = {
 	.node = BFD_PEER_NODE,
 	.prompt = "%s(config-bfd-peer)# ",
-	.vtysh = 1,
 };
 
 static int bfdd_write_config(struct vty *vty)
diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index 4cb86e38e..f2f4ebf92 100644
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -2285,7 +2285,6 @@ static int bgp_config_write_debug(struct vty *vty)
 static struct cmd_node debug_node = {
 	.node = DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 void bgp_debug_init(void)
diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c
index d5609e04e..498950f54 100644
--- a/bgpd/bgp_dump.c
+++ b/bgpd/bgp_dump.c
@@ -781,7 +781,6 @@ DEFUN (no_dump_bgp_all,
 static struct cmd_node bgp_dump_node = {
 	.node = DUMP_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 #if 0
diff --git a/bgpd/bgp_filter.c b/bgpd/bgp_filter.c
index 49912583d..2a19597e4 100644
--- a/bgpd/bgp_filter.c
+++ b/bgpd/bgp_filter.c
@@ -670,7 +670,6 @@ static int config_write_as_list(struct vty *vty)
 static struct cmd_node as_list_node = {
 	.node = AS_LIST_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 /* Register functions. */
diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c
index d626d731f..49d3f25ae 100644
--- a/bgpd/bgp_rpki.c
+++ b/bgpd/bgp_rpki.c
@@ -146,7 +146,6 @@ static int rpki_sync_socket_bgpd;
 static struct cmd_node rpki_node = {
 	.node = RPKI_NODE,
 	.prompt = "%s(config-rpki)# ",
-	.vtysh = 1,
 };
 static const struct route_map_rule_cmd route_match_rpki_cmd = {
 	"rpki", route_match, route_match_compile, route_match_free};
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 6700b632a..a9123abd1 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -15337,79 +15337,66 @@ int bgp_config_write(struct vty *vty)
 static struct cmd_node bgp_node = {
 	.node = BGP_NODE,
 	.prompt = "%s(config-router)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node bgp_ipv4_unicast_node = {
 	.node = BGP_IPV4_NODE,
 	.prompt = "%s(config-router-af)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node bgp_ipv4_multicast_node = {
 	.node = BGP_IPV4M_NODE,
 	.prompt = "%s(config-router-af)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node bgp_ipv4_labeled_unicast_node = {
 	.node = BGP_IPV4L_NODE,
 	.prompt = "%s(config-router-af)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node bgp_ipv6_unicast_node = {
 	.node = BGP_IPV6_NODE,
 	.prompt = "%s(config-router-af)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node bgp_ipv6_multicast_node = {
 	.node = BGP_IPV6M_NODE,
 	.prompt = "%s(config-router-af)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node bgp_ipv6_labeled_unicast_node = {
 	.node = BGP_IPV6L_NODE,
 	.prompt = "%s(config-router-af)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node bgp_vpnv4_node = {
 	.node = BGP_VPNV4_NODE,
 	.prompt = "%s(config-router-af)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node bgp_vpnv6_node = {
 	.node = BGP_VPNV6_NODE,
 	.prompt = "%s(config-router-af-vpnv6)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node bgp_evpn_node = {
 	.node = BGP_EVPN_NODE,
 	.prompt = "%s(config-router-evpn)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node bgp_evpn_vni_node = {
 	.node = BGP_EVPN_VNI_NODE,
 	.prompt = "%s(config-router-af-vni)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node bgp_flowspecv4_node = {
 	.node = BGP_FLOWSPECV4_NODE,
 	.prompt = "%s(config-router-af)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node bgp_flowspecv6_node = {
 	.node = BGP_FLOWSPECV6_NODE,
 	.prompt = "%s(config-router-af-vpnv6)# ",
-	.vtysh = 1,
 };
 
 static void community_list_vty(void);
@@ -17893,7 +17880,6 @@ static int community_list_config_write(struct vty *vty)
 static struct cmd_node community_list_node = {
 	.node = COMMUNITY_LIST_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static void community_list_vty(void)
diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
index 6f949775f..e9b7ae1c6 100644
--- a/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -2967,13 +2967,11 @@ DEFUN_NOSH (exit_vnc,
 static struct cmd_node bgp_vnc_defaults_node = {
 	.node = BGP_VNC_DEFAULTS_NODE,
 	.prompt = "%s(config-router-vnc-defaults)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node bgp_vnc_nve_group_node = {
 	.node = BGP_VNC_NVE_GROUP_NODE,
 	.prompt = "%s(config-router-vnc-nve-group)# ",
-	.vtysh = 1,
 };
 
 /*-------------------------------------------------------------------------
@@ -3396,7 +3394,6 @@ DEFUN_NOSH (exit_vrf_policy,
 static struct cmd_node bgp_vrf_policy_node = {
 	.node = BGP_VRF_POLICY_NODE,
 	.prompt = "%s(config-router-vrf-policy)# ",
-	.vtysh = 1,
 };
 
 /*-------------------------------------------------------------------------
@@ -3635,7 +3632,6 @@ DEFUN (vnc_l2_group_rt,
 static struct cmd_node bgp_vnc_l2_group_node = {
 	.node = BGP_VNC_L2_GROUP_NODE,
 	.prompt = "%s(config-router-vnc-l2-group)# ",
-	.vtysh = 1,
 };
 
 struct rfapi_l2_group_cfg *
diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c
index abc97786b..9a2ab9bb5 100644
--- a/bgpd/rfapi/vnc_debug.c
+++ b/bgpd/rfapi/vnc_debug.c
@@ -176,7 +176,6 @@ static int bgp_vnc_config_write_debug(struct vty *vty)
 static struct cmd_node debug_node = {
 	.node = DEBUG_VNC_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 void vnc_debug_init(void)
diff --git a/eigrpd/eigrp_cli.c b/eigrpd/eigrp_cli.c
index 9b7d65c9c..6d324d47e 100644
--- a/eigrpd/eigrp_cli.c
+++ b/eigrpd/eigrp_cli.c
@@ -841,7 +841,6 @@ void eigrp_cli_show_keychain(struct vty *vty, struct lyd_node *dnode,
 static struct cmd_node eigrp_node = {
 	.node = EIGRP_NODE,
 	.prompt = "%s(config-router)# ",
-	.vtysh = 1,
 };
 
 static int eigrp_config_write(struct vty *vty)
@@ -861,7 +860,6 @@ static int eigrp_config_write(struct vty *vty)
 static struct cmd_node eigrp_interface_node = {
 	.node = INTERFACE_NODE,
 	.prompt = "%s(config-if)# ",
-	.vtysh = 1,
 };
 
 
diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c
index c37e0fae5..3aaac4f53 100644
--- a/eigrpd/eigrp_dump.c
+++ b/eigrpd/eigrp_dump.c
@@ -558,7 +558,6 @@ DEFUN (no_debug_eigrp_packets,
 static struct cmd_node eigrp_debug_node = {
 	.node = DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 /* Initialize debug commands. */
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 2d3bd89fa..24d0408e3 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -1338,7 +1338,6 @@ ferr_r isis_circuit_passwd_hmac_md5_set(struct isis_circuit *circuit,
 struct cmd_node interface_node = {
 	.node = INTERFACE_NODE,
 	.prompt = "%s(config-if)# ",
-	.vtysh = 1,
 };
 
 void isis_circuit_circ_type_set(struct isis_circuit *circuit, int circ_type)
diff --git a/isisd/isisd.c b/isisd/isisd.c
index b56f88982..3341bd441 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -788,7 +788,6 @@ DEFUN_NOSH (show_debugging,
 static struct cmd_node debug_node = {
 	.node = DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static int config_write_debug(struct vty *vty)
@@ -2148,7 +2147,6 @@ int isis_config_write(struct vty *vty)
 struct cmd_node router_node = {
 	.node = ROUTER_NODE,
 	.prompt = "%s(config-router)# ",
-	.vtysh = 1,
 };
 
 void isis_init(void)
diff --git a/ldpd/ldp_debug.c b/ldpd/ldp_debug.c
index 78d40b8ff..77ec8c699 100644
--- a/ldpd/ldp_debug.c
+++ b/ldpd/ldp_debug.c
@@ -33,7 +33,6 @@ struct ldp_debug ldp_debug;
 struct cmd_node ldp_debug_node = {
 	.node = DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 int
diff --git a/ldpd/ldp_vty_conf.c b/ldpd/ldp_vty_conf.c
index 3b8c3404e..dcea6e892 100644
--- a/ldpd/ldp_vty_conf.c
+++ b/ldpd/ldp_vty_conf.c
@@ -40,43 +40,36 @@ static int	 ldp_iface_is_configured(struct ldpd_conf *, const char *);
 struct cmd_node ldp_node = {
 	.node = LDP_NODE,
 	.prompt = "%s(config-ldp)# ",
-	.vtysh = 1,
 };
 
 struct cmd_node ldp_ipv4_node = {
 	.node = LDP_IPV4_NODE,
 	.prompt = "%s(config-ldp-af)# ",
-	.vtysh = 1,
 };
 
 struct cmd_node ldp_ipv6_node = {
 	.node = LDP_IPV6_NODE,
 	.prompt = "%s(config-ldp-af)# ",
-	.vtysh = 1,
 };
 
 struct cmd_node ldp_ipv4_iface_node = {
 	.node = LDP_IPV4_IFACE_NODE,
 	.prompt = "%s(config-ldp-af-if)# ",
-	.vtysh = 1,
 };
 
 struct cmd_node ldp_ipv6_iface_node = {
 	.node = LDP_IPV6_IFACE_NODE,
 	.prompt = "%s(config-ldp-af-if)# ",
-	.vtysh = 1,
 };
 
 struct cmd_node ldp_l2vpn_node = {
 	.node = LDP_L2VPN_NODE,
 	.prompt = "%s(config-l2vpn)# ",
-	.vtysh = 1,
 };
 
 struct cmd_node ldp_pseudowire_node = {
 	.node = LDP_PSEUDOWIRE_NODE,
 	.prompt = "%s(config-l2vpn-pw)# ",
-	.vtysh = 1,
 };
 
 int
diff --git a/lib/agentx.c b/lib/agentx.c
index 0215affd9..8ce154524 100644
--- a/lib/agentx.c
+++ b/lib/agentx.c
@@ -161,7 +161,6 @@ static void agentx_events_update(void)
 static struct cmd_node agentx_node = {
 	.node = SMUX_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 /* Logging NetSNMP messages */
diff --git a/lib/command.c b/lib/command.c
index 85ccbbf19..a26ec1a26 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -203,7 +203,6 @@ static struct cmd_node enable_node = {
 static struct cmd_node config_node = {
 	.node = CONFIG_NODE,
 	.prompt = "%s(config)# ",
-	.vtysh = 1,
 };
 
 static const struct facility_map {
@@ -1724,8 +1723,7 @@ static int vty_write_config(struct vty *vty)
 	vty_out(vty, "!\n");
 
 	for (i = 0; i < vector_active(cmdvec); i++)
-		if ((node = vector_slot(cmdvec, i)) && node->func
-		    && (node->vtysh || vty->type != VTY_SHELL)) {
+		if ((node = vector_slot(cmdvec, i)) && node->func) {
 			if ((*node->func)(vty))
 				vty_out(vty, "!\n");
 		}
diff --git a/lib/command.h b/lib/command.h
index ea8a76a96..06c7ce7b4 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -176,9 +176,6 @@ struct cmd_node {
 	/* Prompt character at vty interface. */
 	const char *prompt;
 
-	/* Is this node's configuration goes to vtysh ? */
-	int vtysh;
-
 	/* Node's configuration write function */
 	int (*func)(struct vty *);
 
diff --git a/lib/filter.c b/lib/filter.c
index 381f9829b..5665dd82b 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -2815,7 +2815,6 @@ static int config_write_access(struct vty *vty, afi_t afi)
 static struct cmd_node access_mac_node = {
 	.node = ACCESS_MAC_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static int config_write_access_mac(struct vty *vty)
@@ -2868,7 +2867,6 @@ static void access_list_init_mac(void)
 static struct cmd_node access_node = {
 	.node = ACCESS_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static int config_write_access_ipv4(struct vty *vty)
@@ -2955,7 +2953,6 @@ static void access_list_init_ipv4(void)
 static struct cmd_node access_ipv6_node = {
 	.node = ACCESS_IPV6_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static int config_write_access_ipv6(struct vty *vty)
diff --git a/lib/keychain.c b/lib/keychain.c
index c0af630c4..c66c1de07 100644
--- a/lib/keychain.c
+++ b/lib/keychain.c
@@ -962,13 +962,11 @@ DEFUN (no_send_lifetime,
 static struct cmd_node keychain_node = {
 	.node = KEYCHAIN_NODE,
 	.prompt = "%s(config-keychain)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node keychain_key_node = {
 	.node = KEYCHAIN_KEY_NODE,
 	.prompt = "%s(config-keychain-key)# ",
-	.vtysh = 1,
 };
 
 static int keychain_strftime(char *buf, int bufsiz, time_t *time)
diff --git a/lib/nexthop_group.c b/lib/nexthop_group.c
index 7c7914a72..95087fe30 100644
--- a/lib/nexthop_group.c
+++ b/lib/nexthop_group.c
@@ -936,7 +936,6 @@ DEFPY(ecmp_nexthops, ecmp_nexthops_cmd,
 static struct cmd_node nexthop_group_node = {
 	.node = NH_GROUP_NODE,
 	.prompt = "%s(config-nh-group)# ",
-	.vtysh = 1,
 };
 
 void nexthop_group_write_nexthop(struct vty *vty, struct nexthop *nh)
diff --git a/lib/northbound_cli.c b/lib/northbound_cli.c
index 9c001a3b0..5803dbd78 100644
--- a/lib/northbound_cli.c
+++ b/lib/northbound_cli.c
@@ -1677,7 +1677,6 @@ static struct debug_callbacks nb_dbg_cbs = {.debug_set_all = nb_debug_set_all};
 static struct cmd_node nb_debug_node = {
 	.node = NORTHBOUND_DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 void nb_cli_install_default(int node)
diff --git a/lib/plist.c b/lib/plist.c
index 15a79a1cd..8f2389a32 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -2048,7 +2048,6 @@ static void prefix_list_reset_afi(afi_t afi, int orf)
 static struct cmd_node prefix_node = {
 	.node = PREFIX_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static int config_write_prefix_ipv4(struct vty *vty)
@@ -2113,7 +2112,6 @@ static void prefix_list_init_ipv4(void)
 static struct cmd_node prefix_ipv6_node = {
 	.node = PREFIX_IPV6_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static int config_write_prefix_ipv6(struct vty *vty)
diff --git a/lib/resolver.c b/lib/resolver.c
index 83e2f5269..9005ee527 100644
--- a/lib/resolver.c
+++ b/lib/resolver.c
@@ -248,7 +248,6 @@ DEFUN(debug_resolver,
 static struct cmd_node resolver_debug_node = {
 	.node = RESOLVER_DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static int resolver_config_write_debug(struct vty *vty)
diff --git a/lib/routemap.c b/lib/routemap.c
index dc73b1e0d..41057c870 100644
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -3018,7 +3018,6 @@ DEFUN (no_debug_rmap,
 static struct cmd_node rmap_debug_node = {
 	.node = RMAP_DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 /* Configuration write function. */
diff --git a/lib/routemap_cli.c b/lib/routemap_cli.c
index b7db1d4dd..a53c54291 100644
--- a/lib/routemap_cli.c
+++ b/lib/routemap_cli.c
@@ -1067,7 +1067,6 @@ static int route_map_config_write(struct vty *vty)
 static struct cmd_node rmap_node = {
 	.node = RMAP_NODE,
 	.prompt = "%s(config-route-map)# ",
-	.vtysh = 1,
 };
 
 static void rmap_autocomplete(vector comps, struct cmd_token *token)
diff --git a/lib/vrf.c b/lib/vrf.c
index 52923a5cd..fbc45fa18 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -761,7 +761,6 @@ DEFUN (no_vrf,
 static struct cmd_node vrf_node = {
 	.node = VRF_NODE,
 	.prompt = "%s(config-vrf)# ",
-	.vtysh = 1,
 };
 
 DEFUN_NOSH (vrf_netns,
@@ -855,7 +854,6 @@ static int vrf_write_host(struct vty *vty)
 static struct cmd_node vrf_debug_node = {
 	.node = VRF_DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 void vrf_install_commands(void)
diff --git a/lib/vty.c b/lib/vty.c
index 57350ea89..5b86455f6 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -2992,7 +2992,6 @@ static int vty_config_write(struct vty *vty)
 struct cmd_node vty_node = {
 	.node = VTY_NODE,
 	.prompt = "%s(config-line)# ",
-	.vtysh = 1,
 };
 
 /* Reset all VTY status. */
diff --git a/nhrpd/nhrp_vty.c b/nhrpd/nhrp_vty.c
index cc35f09aa..69be4db90 100644
--- a/nhrpd/nhrp_vty.c
+++ b/nhrpd/nhrp_vty.c
@@ -20,13 +20,11 @@
 static struct cmd_node zebra_node = {
 	.node = ZEBRA_NODE,
 	.prompt = "%s(config-router)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node nhrp_interface_node = {
 	.node = INTERFACE_NODE,
 	.prompt = "%s(config-if)# ",
-	.vtysh = 1,
 };
 
 #define NHRP_DEBUG_FLAGS_CMD "<all|common|event|interface|kernel|route|vici>"
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index a0dd396cc..2bcaccc42 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -1946,7 +1946,6 @@ static int config_write_ospf6_interface(struct vty *vty)
 static struct cmd_node interface_node = {
 	.node = INTERFACE_NODE,
 	.prompt = "%s(config-if)# ",
-	.vtysh = 1,
 };
 
 static int ospf6_ifp_create(struct interface *ifp)
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 2f646ce44..ae7ecb55a 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -1116,7 +1116,6 @@ static int config_write_ospf6(struct vty *vty)
 static struct cmd_node ospf6_node = {
 	.node = OSPF6_NODE,
 	.prompt = "%s(config-ospf6)# ",
-	.vtysh = 1,
 };
 
 /* Install ospf related commands. */
diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index 1beadca79..8e5406642 100644
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -72,7 +72,6 @@ struct route_node *route_prev(struct route_node *node)
 static struct cmd_node debug_node = {
 	.node = DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static int config_write_ospf6_debug(struct vty *vty)
diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index fda96a80d..6640c7c48 100644
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -1644,7 +1644,6 @@ DEFUN_NOSH (show_debugging_ospf_instance,
 static struct cmd_node debug_node = {
 	.node = DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static int config_write_debug(struct vty *vty)
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index c2b08cab7..b95a98476 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -10559,7 +10559,6 @@ void ospf_vty_show_init(void)
 static struct cmd_node interface_node = {
 	.node = INTERFACE_NODE,
 	.prompt = "%s(config-if)# ",
-	.vtysh = 1,
 };
 
 /* Initialization of OSPF interface. */
@@ -10675,7 +10674,6 @@ static void ospf_vty_zebra_init(void)
 static struct cmd_node ospf_node = {
 	.node = OSPF_NODE,
 	.prompt = "%s(config-router)# ",
-	.vtysh = 1,
 };
 
 static void ospf_interface_clear(struct interface *ifp)
diff --git a/pbrd/pbr_vty.c b/pbrd/pbr_vty.c
index 0ef856bd0..a60d29e51 100644
--- a/pbrd/pbr_vty.c
+++ b/pbrd/pbr_vty.c
@@ -680,7 +680,6 @@ DEFPY (show_pbr_interface,
 static struct cmd_node debug_node = {
 	.node = DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 DEFPY(debug_pbr,
@@ -732,7 +731,6 @@ DEFUN_NOSH(show_debugging_pbr,
 static struct cmd_node interface_node = {
 	.node = INTERFACE_NODE,
 	.prompt = "%s(config-if)# ",
-	.vtysh = 1,
 };
 
 static int pbr_interface_config_write(struct vty *vty)
@@ -764,7 +762,6 @@ static int pbr_interface_config_write(struct vty *vty)
 static struct cmd_node pbr_map_node = {
 	.node = PBRMAP_NODE,
 	.prompt = "%s(config-pbr-map)# ",
-	.vtysh = 1,
 };
 
 static int pbr_vty_map_config_write_sequence(struct vty *vty,
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 248fb9543..3b590230c 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -72,13 +72,11 @@
 static struct cmd_node interface_node = {
 	.node = INTERFACE_NODE,
 	.prompt = "%s(config-if)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node debug_node = {
 	.node = DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static struct vrf *pim_cmd_lookup_vrf(struct vty *vty, struct cmd_token *argv[],
diff --git a/ripd/rip_debug.c b/ripd/rip_debug.c
index fe6b534c9..72cd0c62f 100644
--- a/ripd/rip_debug.c
+++ b/ripd/rip_debug.c
@@ -176,7 +176,6 @@ DEFUN (no_debug_rip_zebra,
 static struct cmd_node debug_node = {
 	.node = DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static int config_write_debug(struct vty *vty)
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 99b7c78d6..10e23787e 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -1196,7 +1196,6 @@ int rip_show_network_config(struct vty *vty, struct rip *rip)
 static struct cmd_node interface_node = {
 	.node = INTERFACE_NODE,
 	.prompt = "%s(config-if)# ",
-	.vtysh = 1,
 };
 
 void rip_interface_sync(struct interface *ifp)
diff --git a/ripd/ripd.c b/ripd/ripd.c
index ecb3fa2d3..95ea19a98 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -3331,7 +3331,6 @@ static int config_write_rip(struct vty *vty)
 static struct cmd_node rip_node = {
 	.node = RIP_NODE,
 	.prompt = "%s(config-router)# ",
-	.vtysh = 1,
 };
 
 /* Distribute-list update functions. */
diff --git a/ripngd/ripng_debug.c b/ripngd/ripng_debug.c
index fe4ec256b..24da4b005 100644
--- a/ripngd/ripng_debug.c
+++ b/ripngd/ripng_debug.c
@@ -178,7 +178,6 @@ DEFUN (no_debug_ripng_zebra,
 static struct cmd_node debug_node = {
 	.node = DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static int config_write_debug(struct vty *vty)
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c
index d322a6ddb..3fac88514 100644
--- a/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@ -958,7 +958,6 @@ static int interface_config_write(struct vty *vty)
 static struct cmd_node interface_node = {
 	.node = INTERFACE_NODE,
 	.prompt = "%s(config-if)# ",
-	.vtysh = 1,
 };
 
 /* Initialization of interface. */
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index 12f8b268f..ad40c0b13 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2438,7 +2438,6 @@ static int ripng_config_write(struct vty *vty)
 static struct cmd_node cmd_ripng_node = {
 	.node = RIPNG_NODE,
 	.prompt = "%s(config-router)# ",
-	.vtysh = 1,
 };
 
 static void ripng_distribute_update(struct distribute_ctx *ctx,
diff --git a/staticd/static_vty.c b/staticd/static_vty.c
index 82d8997da..05c5f7cfe 100644
--- a/staticd/static_vty.c
+++ b/staticd/static_vty.c
@@ -1473,7 +1473,6 @@ DEFUN_NOSH (show_debugging_static,
 static struct cmd_node debug_node = {
 	.node = DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 void static_vty_init(void)
diff --git a/vrrpd/vrrp_vty.c b/vrrpd/vrrp_vty.c
index 98e0e598e..e1dd0a2d4 100644
--- a/vrrpd/vrrp_vty.c
+++ b/vrrpd/vrrp_vty.c
@@ -747,19 +747,16 @@ static int vrrp_config_write_interface(struct vty *vty)
 static struct cmd_node interface_node = {
 	.node = INTERFACE_NODE,
 	.prompt = "%s(config-if)# ",
-	.vtysh = 1,
 };
 
 static struct cmd_node debug_node = {
 	.node = DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static struct cmd_node vrrp_node = {
 	.node = VRRP_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 void vrrp_vty_init(void)
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index b8fd31142..563914af4 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1390,7 +1390,6 @@ struct cmd_node link_params_node = {
 static struct cmd_node rpki_node = {
 	.node = RPKI_NODE,
 	.prompt = "%s(config-rpki)# ",
-	.vtysh = 1,
 };
 
 #if HAVE_BFDD > 0
diff --git a/zebra/debug.c b/zebra/debug.c
index 6e177f839..f7ad228a1 100644
--- a/zebra/debug.c
+++ b/zebra/debug.c
@@ -474,7 +474,6 @@ DEFPY (debug_zebra_nexthop,
 struct cmd_node debug_node = {
 	.node = DEBUG_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 static int config_write_debug(struct vty *vty)
diff --git a/zebra/dplane_fpm_nl.c b/zebra/dplane_fpm_nl.c
index a697a306b..f3bc670a1 100644
--- a/zebra/dplane_fpm_nl.c
+++ b/zebra/dplane_fpm_nl.c
@@ -371,7 +371,6 @@ static int fpm_write_config(struct vty *vty)
 struct cmd_node fpm_node = {
 	.node = VTY_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 /*
diff --git a/zebra/interface.c b/zebra/interface.c
index 520d6a336..e330c4c84 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1667,7 +1667,6 @@ static void interface_update_stats(void)
 struct cmd_node interface_node = {
 	.node = INTERFACE_NODE,
 	.prompt = "%s(config-if)# ",
-	.vtysh = 1,
 };
 
 #ifndef VTYSH_EXTRACT_PL
@@ -2080,7 +2079,6 @@ DEFUN (no_bandwidth_if,
 struct cmd_node link_params_node = {
 	.node = LINK_PARAMS_NODE,
 	.prompt = "%s(config-link-params)# ",
-	.vtysh = 1,
 };
 
 static void link_param_cmd_set_uint32(struct interface *ifp, uint32_t *field,
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index d0e193317..03ad89dcb 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -1942,7 +1942,6 @@ static int fpm_remote_srv_write(struct vty *vty)
 static struct cmd_node zebra_node = {
 	.node = ZEBRA_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 
diff --git a/zebra/zebra_mpls_vty.c b/zebra/zebra_mpls_vty.c
index 78a3110ea..9137f3882 100644
--- a/zebra/zebra_mpls_vty.c
+++ b/zebra/zebra_mpls_vty.c
@@ -453,7 +453,6 @@ DEFUN (no_mpls_label_global_block,
 static struct cmd_node mpls_node = {
 	.node = MPLS_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 /* MPLS VTY.  */
diff --git a/zebra/zebra_pw.c b/zebra/zebra_pw.c
index d16082c51..16f39cd0c 100644
--- a/zebra/zebra_pw.c
+++ b/zebra/zebra_pw.c
@@ -550,7 +550,6 @@ static int zebra_pw_config(struct vty *vty)
 static struct cmd_node pw_node = {
 	.node = PW_NODE,
 	.prompt = "%s(config-pw)# ",
-	.vtysh = 1,
 };
 
 void zebra_pw_vty_init(void)
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index d663e4c5a..c3199bcb5 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -3481,23 +3481,19 @@ DEFUN_HIDDEN (show_frr,
 static struct cmd_node ip_node = {
 	.node = IP_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 static struct cmd_node protocol_node = {
 	.node = PROTOCOL_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 /* table node for routing tables. */
 static struct cmd_node table_node = {
 	.node = TABLE_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 static struct cmd_node forwarding_node = {
 	.node = FORWARDING_NODE,
 	.prompt = "",
-	.vtysh = 1,
 };
 
 /* Route VTY.  */