summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/command.h5
-rw-r--r--lib/distribute.c8
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/command.h b/lib/command.h
index f5572f7f83..f120063ea9 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -386,14 +386,9 @@ struct cmd_element
/* IPv4 only machine should not accept IPv6 address for peer's IP
address. So we replace VTY command string like below. */
-#ifdef HAVE_IPV6
#define NEIGHBOR_ADDR_STR "Neighbor address\nIPv6 address\n"
#define NEIGHBOR_ADDR_STR2 "Neighbor address\nNeighbor IPv6 address\nInterface name or neighbor tag\n"
#define NEIGHBOR_ADDR_STR3 "Neighbor address\nIPv6 address\nInterface name\n"
-#else
-#define NEIGHBOR_ADDR_STR "Neighbor address\n"
-#define NEIGHBOR_ADDR_STR2 "Neighbor address\nNeighbor tag\n"
-#endif /* HAVE_IPV6 */
/* Prototypes. */
extern void install_node (struct cmd_node *, int (*) (struct vty *));
diff --git a/lib/distribute.c b/lib/distribute.c
index 8726e993c5..09f5c8a464 100644
--- a/lib/distribute.c
+++ b/lib/distribute.c
@@ -525,10 +525,16 @@ distribute_list_init (int node)
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);
+ */
/* install v6 */
if (node == RIPNG_NODE) {
- install_element (node, &ipv6_distribute_list_cmd);
+ install_element (RIPNG_NODE, &ipv6_distribute_list_cmd);
}
/* TODO: install v4 syntax command for v6 only protocols. */