From: Maria Matejka <mq@ucw.cz>
Date: Fri, 14 Apr 2023 13:18:18 +0000 (+0200)
Subject: Merge commit '9e44ace3' into thread-next-iface
X-Git-Tag: v3.0-alpha1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61e64d6a4119c32e0fa1b03285f805e21a00f6ab;p=thirdparty%2Fbird.git

Merge commit '9e44ace3' into thread-next-iface
---

61e64d6a4119c32e0fa1b03285f805e21a00f6ab
diff --cc proto/bgp/attrs.c
index 039fdff52,204151c37..8bff4c784
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@@ -2154,8 -1834,8 +2154,8 @@@ bgp_update_attrs(struct bgp_proto *p, s
  
      /* MULTI_EXIT_DESC attribute - accept only if set in export filter */
      a = bgp_find_attr(attrs0, BA_MULTI_EXIT_DISC);
-     if (a && !(a->fresh))
+     if (a && !a->fresh && !p->cf->allow_med)
 -      bgp_unset_attr(&attrs, pool, BA_MULTI_EXIT_DISC);
 +      bgp_unset_attr(&attrs, BA_MULTI_EXIT_DISC);
    }
  
    /* NEXT_HOP attribute - delegated to AF-specific hook */