proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 03:53:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vtysh: Fix static compilation

Browse Source 
When compiling vtysh with --enable-static and --disasble-shared
we get linker errors with duplicate function names.

This commit addresses this issue.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
Donald Sharp 2016-12-07 15:28:44 -05:00 committed by David Lamparter
parent 76c764377c
commit dd2ecdedf8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vtysh/vtysh.c
View File

@ -1385,8 +1385,8 @@ DEFUNSH (VTYSH_ISISD,
} }
DEFUNSH (VTYSH_RMAP, DEFUNSH (VTYSH_RMAP,
route_map, vtysh_route_map,
route_map_cmd, vtysh_route_map_cmd,
"route-map WORD <deny|permit> (1-65535)", "route-map WORD <deny|permit> (1-65535)",
"Create route-map or enter route-map command mode\n" "Create route-map or enter route-map command mode\n"
"Route map tag\n" "Route map tag\n"
@ -1818,13 +1818,13 @@ DEFUNSH (VTYSH_VRF,
/* TODO Implement interface description commands in ripngd, ospf6d /* TODO Implement interface description commands in ripngd, ospf6d
* and isisd. */ * and isisd. */
DEFSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_OSPFD|VTYSH_LDPD, DEFSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_OSPFD|VTYSH_LDPD,
interface_desc_cmd, vtysh_interface_desc_cmd,
"description LINE...", "description LINE...",
"Interface specific description\n" "Interface specific description\n"
"Characters describing this interface\n") "Characters describing this interface\n")
DEFSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_OSPFD, DEFSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_OSPFD,
no_interface_desc_cmd, vtysh_no_interface_desc_cmd,
"no description", "no description",
NO_STR NO_STR
"Interface specific description\n") "Interface specific description\n")
@ -3199,8 +3199,8 @@ vtysh_init_vty (void)
install_element (RMAP_NODE, &vtysh_end_all_cmd); install_element (RMAP_NODE, &vtysh_end_all_cmd);
install_element (VTY_NODE, &vtysh_end_all_cmd); install_element (VTY_NODE, &vtysh_end_all_cmd);
install_element (INTERFACE_NODE, &interface_desc_cmd); install_element (INTERFACE_NODE, &vtysh_interface_desc_cmd);
install_element (INTERFACE_NODE, &no_interface_desc_cmd); install_element (INTERFACE_NODE, &vtysh_no_interface_desc_cmd);
install_element (INTERFACE_NODE, &vtysh_end_all_cmd); install_element (INTERFACE_NODE, &vtysh_end_all_cmd);
install_element (INTERFACE_NODE, &vtysh_exit_interface_cmd); install_element (INTERFACE_NODE, &vtysh_exit_interface_cmd);
install_element (LINK_PARAMS_NODE, &exit_link_params_cmd); install_element (LINK_PARAMS_NODE, &exit_link_params_cmd);
@ -3260,7 +3260,7 @@ vtysh_init_vty (void)
install_element (BGP_VNC_L2_GROUP_NODE, &exit_vnc_config_cmd); install_element (BGP_VNC_L2_GROUP_NODE, &exit_vnc_config_cmd);
install_element (CONFIG_NODE, &key_chain_cmd); install_element (CONFIG_NODE, &key_chain_cmd);
install_element (CONFIG_NODE, &route_map_cmd); install_element (CONFIG_NODE, &vtysh_route_map_cmd);
install_element (CONFIG_NODE, &vtysh_line_vty_cmd); install_element (CONFIG_NODE, &vtysh_line_vty_cmd);
install_element (KEYCHAIN_NODE, &key_cmd); install_element (KEYCHAIN_NODE, &key_cmd);
install_element (KEYCHAIN_NODE, &key_chain_cmd); install_element (KEYCHAIN_NODE, &key_chain_cmd);

6
vtysh/vtysh_user.c
View File

@ -165,8 +165,8 @@ user_get (const char *name)
return user; return user;
} }
DEFUN (banner_motd_file, DEFUN (vtysh_banner_motd_file,
banner_motd_file_cmd, vtysh_banner_motd_file_cmd,
"banner motd file FILE", "banner motd file FILE",
"Set banner\n" "Set banner\n"
"Banner for motd\n" "Banner for motd\n"
@ -231,5 +231,5 @@ vtysh_user_init (void)
{ {
userlist = list_new (); userlist = list_new ();
install_element (CONFIG_NODE, &username_nopassword_cmd); install_element (CONFIG_NODE, &username_nopassword_cmd);
install_element (CONFIG_NODE, &banner_motd_file_cmd); install_element (CONFIG_NODE, &vtysh_banner_motd_file_cmd);
} }