Merge pull request #4960 from ton31337/fix/check_if_rmap_exists_before_warning

bgpd: [7.1] `neighbor X:X::X default-originate` complains about (null)
This commit is contained in:
Donald Sharp 2019-09-11 09:46:32 -04:00 committed by GitHub
commit 1d83c2f7c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4896,13 +4896,14 @@ static int peer_default_originate_set_vty(struct vty *vty, const char *peer_str,
{
int ret;
struct peer *peer;
struct route_map *route_map;
struct route_map *route_map = NULL;
peer = peer_and_group_lookup_vty(vty, peer_str);
if (!peer)
return CMD_WARNING_CONFIG_FAILED;
if (set) {
if (rmap)
route_map = route_map_lookup_warn_noexist(vty, rmap);
ret = peer_default_originate_set(peer, afi, safi,
rmap, route_map);