diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/distribute.c | 16 | ||||
| -rw-r--r-- | lib/grammar_sandbox.c | 2 | ||||
| -rw-r--r-- | lib/keychain.c | 4 | ||||
| -rw-r--r-- | lib/ns.c | 2 | ||||
| -rw-r--r-- | lib/routemap.c | 4 | ||||
| -rw-r--r-- | lib/vrf.c | 2 | ||||
| -rw-r--r-- | lib/vty.c | 12 |
7 files changed, 21 insertions, 21 deletions
diff --git a/lib/distribute.c b/lib/distribute.c index 2e76e352cb..01c338f177 100644 --- a/lib/distribute.c +++ b/lib/distribute.c @@ -524,14 +524,14 @@ distribute_list_init (int node) disthash = hash_create (distribute_hash_make, (int (*) (const void *, const void *)) distribute_cmp); - install_element (node, &distribute_list_cmd); - install_element (node, &no_distribute_list_cmd); -/* - install_element (RIP_NODE, &distribute_list_cmd); - install_element (RIP_NODE, &no_distribute_list_cmd); - install_element (RIPNG_NODE, &distribute_list_cmd); - install_element (RIPNG_NODE, &no_distribute_list_cmd); - */ + /* vtysh command-extraction doesn't grok install_element(node, ) */ + if (node == RIP_NODE) { + install_element (RIP_NODE, &distribute_list_cmd); + install_element (RIP_NODE, &no_distribute_list_cmd); + } else if (node == RIPNG_NODE) { + install_element (RIPNG_NODE, &distribute_list_cmd); + install_element (RIPNG_NODE, &no_distribute_list_cmd); + } /* install v6 */ if (node == RIPNG_NODE) { diff --git a/lib/grammar_sandbox.c b/lib/grammar_sandbox.c index e3a7c979fc..97de943216 100644 --- a/lib/grammar_sandbox.c +++ b/lib/grammar_sandbox.c @@ -411,7 +411,7 @@ DEFUN (grammar_findambig, { int same = prev && !strcmp (prev->cmd, cur->cmd); if (printall && !same) - vty_out (vty, "'%s'%s", cur->cmd, VTY_NEWLINE); + vty_out (vty, "'%s' [%x]%s", cur->cmd, cur->el->daemon, VTY_NEWLINE); if (same) { vty_out (vty, "'%s' AMBIGUOUS:%s", cur->cmd, VTY_NEWLINE); diff --git a/lib/keychain.c b/lib/keychain.c index cd8039b95b..95a2c8e599 100644 --- a/lib/keychain.c +++ b/lib/keychain.c @@ -240,7 +240,7 @@ key_delete (struct keychain *keychain, struct key *key) key_free (key); } -DEFUN (key_chain, +DEFUN_NOSH (key_chain, key_chain_cmd, "key chain WORD", "Authentication key management\n" @@ -280,7 +280,7 @@ DEFUN (no_key_chain, return CMD_SUCCESS; } -DEFUN (key, +DEFUN_NOSH (key, key_cmd, "key (0-2147483647)", "Configure a key\n" @@ -304,7 +304,7 @@ ns_netns_pathname (struct vty *vty, const char *name) return pathname; } -DEFUN (ns_netns, +DEFUN_NOSH (ns_netns, ns_netns_cmd, "logical-router (1-65535) ns NAME", "Enable a logical-router\n" diff --git a/lib/routemap.c b/lib/routemap.c index 1647ac3668..cd34ffaae5 100644 --- a/lib/routemap.c +++ b/lib/routemap.c @@ -2538,7 +2538,7 @@ DEFUN (no_set_tag, -DEFUN (route_map, +DEFUN_NOSH (route_map, route_map_cmd, "route-map WORD <deny|permit> (1-65535)", "Create route-map or enter route-map command mode\n" @@ -2754,7 +2754,7 @@ DEFUN (no_rmap_continue, } -DEFUN (rmap_show_name, +DEFUN_NOSH (rmap_show_name, rmap_show_name_cmd, "show route-map [WORD]", SHOW_STR @@ -474,7 +474,7 @@ vrf_socket (int domain, int type, int protocol, vrf_id_t vrf_id) } /* vrf CLI commands */ -DEFUN (vrf, +DEFUN_NOSH (vrf, vrf_cmd, "vrf NAME", "Select a VRF to configure\n" @@ -2660,7 +2660,7 @@ vty_event (enum event event, int sock, struct vty *vty) } } -DEFUN (config_who, +DEFUN_NOSH (config_who, config_who_cmd, "who", "Display who is on vty\n") @@ -2677,7 +2677,7 @@ DEFUN (config_who, } /* Move to vty configuration mode. */ -DEFUN (line_vty, +DEFUN_NOSH (line_vty, line_vty_cmd, "line vty", "Configure a terminal line\n" @@ -2867,7 +2867,7 @@ DEFUN (no_service_advanced_vty, return CMD_SUCCESS; } -DEFUN (terminal_monitor, +DEFUN_NOSH (terminal_monitor, terminal_monitor_cmd, "terminal monitor", "Set terminal line parameters\n" @@ -2877,7 +2877,7 @@ DEFUN (terminal_monitor, return CMD_SUCCESS; } -DEFUN (terminal_no_monitor, +DEFUN_NOSH (terminal_no_monitor, terminal_no_monitor_cmd, "terminal no monitor", "Set terminal line parameters\n" @@ -2888,7 +2888,7 @@ DEFUN (terminal_no_monitor, return CMD_SUCCESS; } -DEFUN (no_terminal_monitor, +DEFUN_NOSH (no_terminal_monitor, no_terminal_monitor_cmd, "no terminal monitor", NO_STR @@ -2899,7 +2899,7 @@ DEFUN (no_terminal_monitor, } -DEFUN (show_history, +DEFUN_NOSH (show_history, show_history_cmd, "show history", SHOW_STR |